diff --git a/deco.lua b/deco.lua
index 6831782286b8293932ba57fd86b1ecf81041c265..430ea72a9f736d120b3819f3802b3e759096b627 100644
--- a/deco.lua
+++ b/deco.lua
@@ -7,134 +7,124 @@ local newnode
 local light_max = default.light_max or 10
 
 
-if not minetest.registered_items['fun_caves:stalactite'] then
-  -- Speleothems can be made into cobblestone, to get them out of inventory.
-  minetest.register_craft({
-    output = "default:cobble",
-    recipe = {
-      {"", "", ""},
-      {"underworlds:stalactite", "underworlds:stalactite", ""},
-      {"underworlds:stalactite", "underworlds:stalactite", ""},
-    },
-  })
-
-  minetest.register_craft({
-    output = "default:cobble",
-    recipe = {
-      {"", "", ""},
-      {"underworlds:stalagmite", "underworlds:stalagmite", ""},
-      {"underworlds:stalagmite", "underworlds:stalagmite", ""},
-    },
-  })
-
-  -- What's a cave without speleothems?
-  local spel = {
-    {type1="stalactite", type2="stalagmite", tile="default_stone.png"},
-    {type1="stalactite_slimy", type2="stalagmite_slimy", tile="default_stone.png^underworlds_algae.png"},
-    {type1="stalactite_mossy", type2="stalagmite_mossy", tile="default_stone.png^underworlds_moss.png"},
-    {type1="icicle_down", type2="icicle_up", desc="Icicle", tile="caverealms_thin_ice.png", drop="default:ice"},
-  }
-
-  for _, desc in pairs(spel) do
-    minetest.register_node("underworlds:"..desc.type1, {
-      description = (desc.desc or "Stalactite"),
-      tiles = {desc.tile},
-      is_ground_content = true,
-      walkable = false,
-      paramtype = "light",
-      drop = (desc.drop or "underworlds:stalactite"),
-      drawtype = "nodebox",
-      node_box = { type = "fixed", 
-        fixed = {
-          {-0.07, 0.0, -0.07, 0.07, 0.5, 0.07}, 
-          {-0.04, -0.25, -0.04, 0.04, 0.0, 0.04}, 
-          {-0.02, -0.5, -0.02, 0.02, 0.25, 0.02}, 
-        } },
-      groups = {rock=1, cracky=3},
-      sounds = default.node_sound_stone_defaults(),
-    })
-
-    minetest.register_node("underworlds:"..desc.type2, {
-      description = (desc.desc or "Stalagmite"),
-      tiles = {desc.tile},
-      is_ground_content = true,
-      walkable = false,
-      paramtype = "light",
-      drop = "underworlds:stalagmite",
-      drawtype = "nodebox",
-      node_box = { type = "fixed", 
-        fixed = {
-          {-0.07, -0.5, -0.07, 0.07, 0.0, 0.07}, 
-          {-0.04, 0.0, -0.04, 0.04, 0.25, 0.04}, 
-          {-0.02, 0.25, -0.02, 0.02, 0.5, 0.02}, 
-        } },
-      groups = {rock=1, cracky=3},
-      sounds = default.node_sound_stone_defaults(),
-    })
-  end
-end
+local spel = {
+  {type1="stalactite", type2="stalagmite", tile="default_stone.png"},
+  {type1="stalactite_slimy", type2="stalagmite_slimy", tile="default_stone.png^underworlds_algae.png"},
+  {type1="stalactite_mossy", type2="stalagmite_mossy", tile="default_stone.png^underworlds_moss.png"},
+  {type1="icicle_down", type2="icicle_up", desc="Icicle", tile="caverealms_thin_ice.png", drop="default:ice"},
+}
+
+-- Speleothems can be made into cobblestone, to get them out of inventory.
+minetest.register_craft({
+  output = "default:cobble",
+  recipe = {
+    {"", "", ""},
+    {"underworlds:stalactite", "underworlds:stalactite", ""},
+    {"underworlds:stalactite", "underworlds:stalactite", ""},
+  },
+})
 
-if not minetest.registered_items['fun_caves:hot_stone'] then
-  -- stone, hot
-  minetest.register_node("underworlds:hot_stone", {
-    description = "Hot Stone",
-    tiles = {"default_desert_stone.png^[colorize:#FF0000:150"},
-    is_ground_content = true,
-    groups = {crumbly=2, surface_hot=3},
-    light_source = light_max - 5,
-    damage_per_second = 1,
-    sounds = default.node_sound_stone_defaults({
-      footstep = {name="default_stone_footstep", gain=0.25},
-    }),
-  })
-end
+minetest.register_craft({
+  output = "default:cobble",
+  recipe = {
+    {"", "", ""},
+    {"underworlds:stalagmite", "underworlds:stalagmite", ""},
+    {"underworlds:stalagmite", "underworlds:stalagmite", ""},
+  },
+})
 
-if not minetest.registered_items['fun_caves:glowing_fungal_stone'] then
-  -- Glowing fungal stone provides an eerie light.
-  minetest.register_node("underworlds:glowing_fungal_stone", {
-    description = "Glowing Fungal Stone",
-    tiles = {"default_stone.png^vmg_glowing_fungal.png",},
+-- What's a cave without speleothems?
+for _, desc in pairs(spel) do
+  minetest.register_node("underworlds:"..desc.type1, {
+    description = (desc.desc or "Stalactite"),
+    tiles = {desc.tile},
     is_ground_content = true,
-    light_source = light_max - 4,
-    groups = {cracky=3, stone=1},
-    drop = {items={ {items={"default:cobble"},}, {items={"underworlds:glowing_fungus",},},},},
+    walkable = false,
+    paramtype = "light",
+    drop = (desc.drop or "underworlds:stalactite"),
+    drawtype = "nodebox",
+    node_box = { type = "fixed", 
+    fixed = {
+      {-0.07, 0.0, -0.07, 0.07, 0.5, 0.07}, 
+      {-0.04, -0.25, -0.04, 0.04, 0.0, 0.04}, 
+      {-0.02, -0.5, -0.02, 0.02, 0.25, 0.02}, 
+    } },
+    groups = {rock=1, cracky=3},
     sounds = default.node_sound_stone_defaults(),
   })
 
-  -- Glowing fungus grows underground.
-  minetest.register_craftitem("underworlds:glowing_fungus", {
-    description = "Glowing Fungus",
-    drawtype = "plantlike",
+  minetest.register_node("underworlds:"..desc.type2, {
+    description = (desc.desc or "Stalagmite"),
+    tiles = {desc.tile},
+    is_ground_content = true,
+    walkable = false,
     paramtype = "light",
-    tiles = {"vmg_glowing_fungus.png"},
-    inventory_image = "vmg_glowing_fungus.png",
-    groups = {dig_immediate = 3},
+    drop = "underworlds:stalagmite",
+    drawtype = "nodebox",
+    node_box = { type = "fixed", 
+    fixed = {
+      {-0.07, -0.5, -0.07, 0.07, 0.0, 0.07}, 
+      {-0.04, 0.0, -0.04, 0.04, 0.25, 0.04}, 
+      {-0.02, 0.25, -0.02, 0.02, 0.5, 0.02}, 
+    } },
+    groups = {rock=1, cracky=3},
+    sounds = default.node_sound_stone_defaults(),
   })
 end
 
-if not minetest.registered_items['fun_caves:black_sand'] then
-  -- black (oily) sand
-  local newnode = underworlds_mod.clone_node("default:sand")
-  newnode.description = "Black Sand"
-  newnode.tiles = {"underworlds_black_sand.png"}
-  newnode.groups['falling_node'] = 0
-  minetest.register_node("underworlds:black_sand", newnode)
-end
+-- stone, hot
+minetest.register_node("underworlds:hot_stone", {
+  description = "Hot Stone",
+  tiles = {"default_desert_stone.png^[colorize:#FF0000:150"},
+  is_ground_content = true,
+  groups = {crumbly=2, surface_hot=3},
+  light_source = light_max - 5,
+  damage_per_second = 1,
+  sounds = default.node_sound_stone_defaults({
+    footstep = {name="default_stone_footstep", gain=0.25},
+  }),
+})
 
-if not minetest.registered_items['fun_caves:hot_cobble'] then
-  -- cobble, hot - cobble with lava instead of mortar XD
-  minetest.register_node("underworlds:hot_cobble", {
-    description = "Hot Cobble",
-    tiles = {"caverealms_hot_cobble.png"},
-    is_ground_content = true,
-    groups = {crumbly=2, surface_hot=3},
-    --light_source = 2,
-    damage_per_second = 1,
-    sounds = default.node_sound_stone_defaults({
-      footstep = {name="default_stone_footstep", gain=0.25},
-    }),
-  })
-end
+-- Glowing fungal stone provides an eerie light.
+minetest.register_node("underworlds:glowing_fungal_stone", {
+  description = "Glowing Fungal Stone",
+  tiles = {"default_stone.png^vmg_glowing_fungal.png",},
+  is_ground_content = true,
+  light_source = light_max - 4,
+  groups = {cracky=3, stone=1},
+  drop = {items={ {items={"default:cobble"},}, {items={"underworlds:glowing_fungus",},},},},
+  sounds = default.node_sound_stone_defaults(),
+})
+
+-- Glowing fungus grows underground.
+minetest.register_craftitem("underworlds:glowing_fungus", {
+  description = "Glowing Fungus",
+  drawtype = "plantlike",
+  paramtype = "light",
+  tiles = {"vmg_glowing_fungus.png"},
+  inventory_image = "vmg_glowing_fungus.png",
+  groups = {dig_immediate = 3},
+})
+
+-- black (oily) sand
+local newnode = underworlds_mod.clone_node("default:sand")
+newnode.description = "Black Sand"
+newnode.tiles = {"underworlds_black_sand.png"}
+newnode.groups['falling_node'] = 0
+minetest.register_node("underworlds:black_sand", newnode)
+
+-- cobble, hot - cobble with lava instead of mortar XD
+minetest.register_node("underworlds:hot_cobble", {
+  description = "Hot Cobble",
+  tiles = {"caverealms_hot_cobble.png"},
+  is_ground_content = true,
+  groups = {crumbly=2, surface_hot=3},
+  --light_source = 2,
+  damage_per_second = 1,
+  sounds = default.node_sound_stone_defaults({
+    footstep = {name="default_stone_footstep", gain=0.25},
+  }),
+})
 
 newnode = underworlds_mod.clone_node("default:water_source")
 newnode.description = "Poisonous Water"
@@ -158,22 +148,20 @@ newnode.special_tiles[1].name = "underworlds_water_poison_flowing_animated.png"
 newnode.tiles[1] = "underworlds_water_poison.png"
 minetest.register_node("underworlds:water_poison_flowing", newnode)
 
-if not minetest.registered_items['fun_caves:thin_ice'] then
-  -- ice, thin -- transparent
-  minetest.register_node("underworlds:thin_ice", {
-    description = "Thin Ice",
-    tiles = {"caverealms_thin_ice.png"},
-    is_ground_content = true,
-    groups = {cracky=3},
-    sounds = default.node_sound_glass_defaults(),
-    use_texture_alpha = true,
-    light_source = 1,
-    drawtype = "glasslike",
-    sunlight_propagates = true,
-    freezemelt = "default:water_source",
-    paramtype = "light",
-  })
-end
+-- ice, thin -- transparent
+minetest.register_node("underworlds:thin_ice", {
+  description = "Thin Ice",
+  tiles = {"caverealms_thin_ice.png"},
+  is_ground_content = true,
+  groups = {cracky=3},
+  sounds = default.node_sound_glass_defaults(),
+  use_texture_alpha = true,
+  light_source = 1,
+  drawtype = "glasslike",
+  sunlight_propagates = true,
+  freezemelt = "default:water_source",
+  paramtype = "light",
+})
 
 -- Iron, hot
 newnode = underworlds_mod.clone_node("default:steelblock")
diff --git a/mapgen.lua b/mapgen.lua
index 0195c13bac4aa749fe249fb2667a598d70dd6d4f..90b71353d1c1923e33a874f0c87a54c51ebb71ff 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -3,7 +3,7 @@
 -- Distributed under the LGPLv2.1 (https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html)
 
 
-local DEBUG = true
+local DEBUG = false
 local max_depth = 31000
 local seed_noise = {offset = 0, scale = 32768, seed = 5202, spread = {x = 80, y = 80, z = 80}, octaves = 2, persist = 0.4, lacunarity = 2}
 
diff --git a/screenshot-1.jpg b/screenshot-1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c48dccf20d935da83cfb838f3890f0be5143b075
Binary files /dev/null and b/screenshot-1.jpg differ
diff --git a/screenshot-2.jpg b/screenshot-2.jpg
index 46b42e3688ae06a87f40dfd8a610f099f90c0ab0..8a11884cdd9ea9ccae482b646f93b1c1134e47e9 100644
Binary files a/screenshot-2.jpg and b/screenshot-2.jpg differ
diff --git a/screenshot-3.jpg b/screenshot-3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9635d6d3080f060c8c7ecb350cb1c2d76f42d7ba
Binary files /dev/null and b/screenshot-3.jpg differ
diff --git a/screenshot-4.jpg b/screenshot-4.jpg
index c4a79a648cf690d1aafc87af9dfe426dd1d68c17..4889bd588188c8fe87e50d7adc1251c628f6bbbd 100644
Binary files a/screenshot-4.jpg and b/screenshot-4.jpg differ
diff --git a/screenshot-5.jpg b/screenshot-5.jpg
index 5c84f1c7ed72d68640e3f1d9ac36e8df6b1bdab8..7f81e9f2e7ac1289d0366045078ef8f1d18b5015 100644
Binary files a/screenshot-5.jpg and b/screenshot-5.jpg differ