diff --git a/CHANGELOG.md b/CHANGELOG.md
index c834721..39498c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ This update contains breaking changes due to the grass revamp
 - Change the games style in terms of textures
 - Creative block breaking speed increased
 - "Revamped" grass
+- Added Bedrock as a barrier between worlds
+- Removed enchanted obsidian, more ways to obtain magic shards will be added in the future
 
 ## [Oct 6th 2024] Unnamed Minor Update
 
diff --git a/mods/CORE/pyutest/init.lua b/mods/CORE/pyutest/init.lua
index aa3cd44..34c2c3f 100644
--- a/mods/CORE/pyutest/init.lua
+++ b/mods/CORE/pyutest/init.lua
@@ -9,6 +9,9 @@ PyuTest.OVERWORLD_SURFACE_BOTTOM = 1
 PyuTest.OVERWORLD_TOP = 4096
 PyuTest.OVERWORLD_BOTTOM = -200
 
+PyuTest.WORLD_TOP = 31000
+PyuTest.WORLD_BOTTOM = -31000
+
 -- these values are yoinked from VoxeLibre
 -- (https://git.minetest.land/VoxeLibre/VoxeLibre/src/branch/master/mods/MAPGEN/mcl_biomes/init.lua)
 PyuTest.OVERWORLD_OCEAN_MIN = -15
diff --git a/mods/ITEMS/pyutest_blocks/api.lua b/mods/ITEMS/pyutest_blocks/api.lua
index 02c9d5a..acd39e2 100644
--- a/mods/ITEMS/pyutest_blocks/api.lua
+++ b/mods/ITEMS/pyutest_blocks/api.lua
@@ -183,3 +183,51 @@ PyuTest.make_building_blocks = function(name, desc, tex, colortint, cgroups, ext
     }
   })
 end
+
+PyuTest.make_liquid = function(name, desc, groups, texture, speed, extra_conf)
+  local function make_liquid_flags(liquidtype)
+    local drawtype = ""
+
+    if liquidtype == "source" then
+      drawtype = "liquid"
+    elseif liquidtype == "flowing" then
+      drawtype = "flowingliquid"
+    end
+
+    local t = PyuTest.util.tableconcat({
+      drawtype = drawtype,
+      waving = 3,
+      walkable = false,
+      pointable = false,
+      buildable_to = true,
+      is_ground_content = false,
+      use_texture_alpha = "blend",
+      paramtype = "light",
+      drop = "",
+      drowning = 3,
+      liquidtype = liquidtype,
+      liquid_renewable = true,
+      liquid_viscosity = speed or 1,
+      liquid_alternative_flowing = name .. "_flowing",
+      liquid_alternative_source = name .. "_source",
+      paramtype2 = liquidtype == "flowing" and "flowingliquid" or nil,
+      special_tiles = liquidtype == "flowing" and {
+        {
+          name = texture,
+          backface_culling = false
+        },
+        {
+          name = texture,
+          backface_culling = true
+        }
+      } or nil
+    }, extra_conf or {})
+    return t
+  end
+
+  local g = groups or {}
+  g["liquid"] = 1
+
+  PyuTest.make_node(name .. "_source", desc .. " Source", g, { texture }, make_liquid_flags("source"))
+  PyuTest.make_node(name .. "_flowing", "Flowing " .. desc, g, { texture }, make_liquid_flags("flowing"))
+end
diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua
index cef0ce5..2f732c4 100644
--- a/mods/ITEMS/pyutest_blocks/basic.lua
+++ b/mods/ITEMS/pyutest_blocks/basic.lua
@@ -4,14 +4,16 @@ PyuTest.make_building_blocks("pyutest_blocks:dirt", "Dirt", { "pyutest-dirt.png"
   crumbly = PyuTest.BLOCK_FAST
 })
 
-PyuTest.make_building_blocks("pyutest_blocks:podzol", "Podzol", { "pyutest-podzol.png" }, nil, {
+PyuTest.make_building_blocks("pyutest_blocks:podzol", "Podzol", { "pyutest-dirt.png" }, nil, {
   ground = 1,
   acid_vulnerable = 1,
   crumbly = PyuTest.BLOCK_FAST
+}, {
+  overlay_tiles = {{name = "pyutest-ore-overlay.png", color = "#54623c"}}
 })
 
 PyuTest.make_building_blocks("pyutest_blocks:snow", "Snow", { "pyutest-snow.png" }, nil, {
-  ground = 1,
+ground = 1,
   acid_vulnerable = 1,
   crumbly = PyuTest.BLOCK_FAST
 })
@@ -25,10 +27,12 @@ PyuTest.make_building_blocks("pyutest_blocks:sand", "Sand", { "pyutest-sand.png"
 })
 
 PyuTest.make_building_blocks("pyutest_blocks:mycelium", "Mycelium", {
-  "pyutest-mycelium.png"
+  {name = "pyutest-grass-top.png", color = "#5c455e"}, "pyutest-dirt.png"
 }, nil, {
   ground = 1,
-  crumbly = PyuTest.BLOCK_FAST
+  crumbly = PyuTest.BLOCK_FAST,
+}, {
+  overlay_tiles = {"", "", {name = "pyutest-grass-side.png", color = "#5c455e"}}
 })
 
 PyuTest.make_building_blocks("pyutest_blocks:clay", "Clay", { "pyutest-clay-block.png" }, nil, {
@@ -110,26 +114,12 @@ PyuTest.make_building_blocks("pyutest_blocks:bone", "Bone", {
   cracky = PyuTest.BLOCK_FAST
 })
 
-PyuTest.make_building_blocks("pyutest_blocks:enchanted_obsidian", "Enchanted Obsidian", {
-  "pyutest-enchanted-obsidian.png"
-}, nil, {
-  cracky = PyuTest.BLOCK_SLOW
-}, {
-  is_ground_content = false
-})
-
 PyuTest.make_building_blocks("pyutest_blocks:brick", "Brick", { "pyutest-bricks.png" }, nil, {
   cracky = PyuTest.BLOCK_NORMAL
 }, {
   is_ground_content = false
 })
 
-PyuTest.make_building_blocks("pyutest_blocks:stone_bricks", "Stone Bricks", { "pyutest-stone-bricks.png" }, nil, {
-  cracky = PyuTest.BLOCK_SLOW
-}, {
-  is_ground_content = false
-})
-
 -- Choppy
 PyuTest.make_building_blocks("pyutest_blocks:mushroom", "Mushroom", { "pyutest-mushroom.png" }, nil, {
   flammable = 1,
@@ -166,7 +156,7 @@ PyuTest.make_building_blocks("pyutest_blocks:slime", "Slime", { "pyutest-slime.p
   oddly_breakable_by_hand = PyuTest.BLOCK_FAST
 })
 
-PyuTest.make_building_blocks("pyutest_blocks:glowslime", "Glowslime", { "pyutest-glowslime.png" }, nil, {
+PyuTest.make_building_blocks("pyutest_blocks:glowslime", "Glowslime", { "pyutest-slime.png" }, nil, {
   bouncy = 85,
   oddly_breakable_by_hand = PyuTest.BLOCK_FAST
 }, {
diff --git a/mods/ITEMS/pyutest_blocks/liquid.lua b/mods/ITEMS/pyutest_blocks/liquid.lua
index 113852c..724afa0 100644
--- a/mods/ITEMS/pyutest_blocks/liquid.lua
+++ b/mods/ITEMS/pyutest_blocks/liquid.lua
@@ -1,51 +1,3 @@
-PyuTest.make_liquid = function(name, desc, groups, texture, speed, extra_conf)
-  local function make_liquid_flags(liquidtype)
-    local drawtype = ""
-
-    if liquidtype == "source" then
-      drawtype = "liquid"
-    elseif liquidtype == "flowing" then
-      drawtype = "flowingliquid"
-    end
-
-    local t = PyuTest.util.tableconcat({
-      drawtype = drawtype,
-      waving = 3,
-      walkable = false,
-      pointable = false,
-      buildable_to = true,
-      is_ground_content = false,
-      use_texture_alpha = "blend",
-      paramtype = "light",
-      drop = "",
-      drowning = 3,
-      liquidtype = liquidtype,
-      liquid_renewable = true,
-      liquid_viscosity = speed or 1,
-      liquid_alternative_flowing = name .. "_flowing",
-      liquid_alternative_source = name .. "_source",
-      paramtype2 = liquidtype == "flowing" and "flowingliquid" or nil,
-      special_tiles = liquidtype == "flowing" and {
-        {
-          name = texture,
-          backface_culling = false
-        },
-        {
-          name = texture,
-          backface_culling = true
-        }
-      } or nil
-    }, extra_conf or {})
-    return t
-  end
-
-  local g = groups or {}
-  g["liquid"] = 1
-
-  PyuTest.make_node(name .. "_source", desc .. " Source", g, { texture }, make_liquid_flags("source"))
-  PyuTest.make_node(name .. "_flowing", "Flowing " .. desc, g, { texture }, make_liquid_flags("flowing"))
-end
-
 PyuTest.make_liquid("pyutest_blocks:water", "Water", {
   water = 1,
   freezable = 1,
diff --git a/mods/ITEMS/pyutest_blocks/special.lua b/mods/ITEMS/pyutest_blocks/special.lua
index ed9638b..ad9a6c3 100644
--- a/mods/ITEMS/pyutest_blocks/special.lua
+++ b/mods/ITEMS/pyutest_blocks/special.lua
@@ -173,10 +173,20 @@ PyuTest.make_node("pyutest_blocks:ladder", "Ladder", {
 
 PyuTest.make_node("pyutest_blocks:magma", "Magma", {
   cracky = PyuTest.BLOCK_FAST
-}, { "pyutest-magma.png" }, {
+}, { "pyutest-molten-rock.png" }, {
   paramtype = "light",
   light_source = 11,
-  damage_per_second = 3
+  damage_per_second = 3,
+  overlay_tiles = {
+    {name = "pyutest-ore-overlay.png", color = "darkorange"}
+  }
+})
+
+PyuTest.make_node("pyutest_blocks:bedrock", "Bedrock", {
+}, {"pyutest-bedrock.png"}, {
+  diggable = false,
+  pointable = "blocking",
+  is_ground_content = false
 })
 
 minetest.register_abm({
diff --git a/mods/ITEMS/pyutest_flowers/init.lua b/mods/ITEMS/pyutest_flowers/init.lua
index fa5fede..35c0dbe 100644
--- a/mods/ITEMS/pyutest_flowers/init.lua
+++ b/mods/ITEMS/pyutest_flowers/init.lua
@@ -77,7 +77,7 @@ PyuTest.make_node("pyutest_flowers:vines", "Vines", {
 
 PyuTest.make_flower("pyutest_flowers:kelp", "Kelp", "pyutest-kelp.png", "pyutest_flowers:green_dye", false, "plantlike_rooted", {
   paramtype2 = "leveled",
-  place_param2 = 128,
+  place_param2 = 16,
   wield_image = "pyutest-kelp.png",
   special_tiles = {
     {
diff --git a/mods/ITEMS/pyutest_leaves/init.lua b/mods/ITEMS/pyutest_leaves/init.lua
index 159ea8a..9cecd74 100644
--- a/mods/ITEMS/pyutest_leaves/init.lua
+++ b/mods/ITEMS/pyutest_leaves/init.lua
@@ -1,33 +1,49 @@
-PyuTest.make_leaves = function(id, desc, tiles)
-  PyuTest.make_building_blocks(id.."_leaves", desc .. " Leaves", tiles, nil, {
+PyuTest.make_leaves = function(id, desc, color, overlay, special_drops)
+  local leaves_id = id .. "_leaves_block"
+  PyuTest.make_node(leaves_id, desc .. " Leaves", {
     acid_vulnerable = 1,
     flammable = 1,
     snappy = PyuTest.BLOCK_FAST
-  }, {
-    is_ground_content = false
+  }, {{name = "pyutest-leaves.png", color = color}}, {
+    drawtype = "allfaces_optional",
+    waving = 2,
+    paramtype = "light",
+    sunlight_propagates = true,
+    is_ground_content = false,
+    overlay_tiles = {overlay},
   })
+  if special_drops == nil or special_drops == true then
+    minetest.override_item(leaves_id, {
+      drop = {
+        max_items = 1,
+        items = {
+          {
+            rarity = 2.9,
+            items = {"pyutest_tools:apple"}
+          },
 
-  local leaves_id = id .. "_leaves_block"
-  minetest.override_item(leaves_id, {
-    drop = {
-      max_items = 1,
-      items = {
-        {
-          rarity = 2.5,
-          items = { "pyutest_tools:apple 1" }
-        },
+          {
+            rarity = 2.2,
+            items = {"pyutest_tools:stick 2"}
+          },
 
-        {
-          items = { leaves_id }
+          {
+            rarity = 2.2,
+            items = {"pyutest_tools:stick 1"}
+          },
+
+          {
+            items = {leaves_id}
+          }
         }
       }
-    }
-  })
+    })
+  end
 end
 
-PyuTest.make_leaves("pyutest_leaves:oak", "Oak", { "pyutest-leaves.png" })
-PyuTest.make_leaves("pyutest_leaves:snowy", "Snowy", { "pyutest-snowy-leaves.png" })
-PyuTest.make_leaves("pyutest_leaves:cherry", "Cherry", { "pyutest-cherry-leaves.png" })
-PyuTest.make_leaves("pyutest_leaves:dark", "Dark", { "pyutest-dark-leaves.png" })
-PyuTest.make_leaves("pyutest_leaves:aspen", "Aspen", { "pyutest-aspen-leaves.png" })
-PyuTest.make_leaves("pyutest_leaves:red_aspen", "Red Aspen", { "pyutest-red-aspen-leaves.png" })
+PyuTest.make_leaves("pyutest_leaves:oak", "Oak", "#749752")
+PyuTest.make_leaves("pyutest_leaves:snowy", "Snowy")
+PyuTest.make_leaves("pyutest_leaves:cherry", "Cherry", "#f3c2db")
+PyuTest.make_leaves("pyutest_leaves:dark", "Dark", "#4f613e")
+PyuTest.make_leaves("pyutest_leaves:aspen", "Aspen", "#978c52")
+PyuTest.make_leaves("pyutest_leaves:red_aspen", "Red Aspen", "#945c53")
diff --git a/mods/ITEMS/pyutest_magic/init.lua b/mods/ITEMS/pyutest_magic/init.lua
index e6b6075..6cc26ae 100644
--- a/mods/ITEMS/pyutest_magic/init.lua
+++ b/mods/ITEMS/pyutest_magic/init.lua
@@ -1,19 +1,4 @@
 PyuTest.make_item("pyutest_magic:magic_shards", "Magic Shards", {}, "pyutest-magic-shards.png")
-minetest.override_item("pyutest_blocks:enchanted_obsidian_block", {
-  drop = {
-    max_items = 1,
-    items = {
-      {
-        rarity = 3.2,
-        items = {"pyutest_magic:magic_shards 3"}
-      },
-
-      {
-        items = {"enchanted_obsidian_block_obsidian_block"}
-      }
-    }
-  }
-})
 
 PyuTest.registered_spellbooks = {}
 PyuTest.make_spellbook = function (nsname, desc, color, craftitem, action)
diff --git a/mods/MAPGEN/pyutest_ores/init.lua b/mods/MAPGEN/pyutest_ores/init.lua
index 57909e6..abc4336 100644
--- a/mods/MAPGEN/pyutest_ores/init.lua
+++ b/mods/MAPGEN/pyutest_ores/init.lua
@@ -53,10 +53,12 @@ PyuTest.ORE_STONES = {
 
 PyuTest.registered_ores = {}
 
-PyuTest.make_ore = function(id, desc, item_id_suffix, item_description_suffix, options)
+PyuTest.make_ore_and_item = function(id, desc, item_id_suffix, item_description_suffix, options)
   local default_options = {
     scarcity = 5 * 5 * 5,
-    y_max = 31000,
+    y_max = PyuTest.WORLD_TOP,
+    y_min = PyuTest.OVERWORLD_BOTTOM,
+    wherein = {},
 
     ore_strength = PyuTest.BLOCK_NORMAL,
     ore_conf = {},
@@ -141,34 +143,34 @@ PyuTest.make_ore = function(id, desc, item_id_suffix, item_description_suffix, o
   minetest.register_ore({
     ore_type = "scatter",
     ore = oid,
-    wherein = PyuTest.ORE_STONES,
+    wherein = conf.wherein,
     clust_scarcity = conf.scarcity,
     clust_num_ores = 4,
     clust_size = 3,
     y_max = conf.y_max,
-    y_min = PyuTest.OVERWORLD_BOTTOM,
+    y_min = conf.y_min,
   })
 
   minetest.register_ore({
     ore_type = "scatter",
     ore = oid,
-    wherein = PyuTest.ORE_STONES,
+    wherein = conf.wherein,
     clust_scarcity = conf.scarcity * 2.2,
     clust_num_ores = 9,
     clust_size = 3,
     y_max = conf.y_max,
-    y_min = PyuTest.OVERWORLD_BOTTOM,
+    y_min = conf.y_min,
   })
 
   minetest.register_ore({
     ore_type = "scatter",
     ore = oid,
-    wherein = PyuTest.ORE_STONES,
+    wherein = conf.wherein,
     clust_scarcity = conf.scarcity * 3,
     clust_num_ores = 18,
     clust_size = 6,
     y_max = conf.y_max,
-    y_min = PyuTest.OVERWORLD_BOTTOM,
+    y_min = conf.y_min,
   })
 
   PyuTest.make_building_blocks(id, desc, conf.block_tiles, conf.block_color, PyuTest.util.tableconcat({
@@ -194,9 +196,10 @@ PyuTest.make_ore = function(id, desc, item_id_suffix, item_description_suffix, o
 end
 
 -- "Primary" Ores
-PyuTest.make_ore("pyutest_ores:coal", "Coal", "lump", "Lump", {
+PyuTest.make_ore_and_item("pyutest_ores:coal", "Coal", "lump", "Lump", {
   scarcity = 8 * 8 * 8,
   y_max = 48,
+  wherein = PyuTest.ORE_STONES,
 
   ore_strength = PyuTest.BLOCK_NORMAL,
   ore_drop_count = 2,
@@ -214,9 +217,10 @@ PyuTest.make_ore("pyutest_ores:coal", "Coal", "lump", "Lump", {
   block_color = {r = 32, g = 32, b = 32}
 })
 
-PyuTest.make_ore("pyutest_ores:iron", "Iron", "ingot", "Ingot", {
+PyuTest.make_ore_and_item("pyutest_ores:iron", "Iron", "ingot", "Ingot", {
   scarcity = 11 * 11 * 11,
   y_max = 18,
+  wherein = PyuTest.ORE_STONES,
 
   ore_strength = PyuTest.BLOCK_NORMAL,
 
@@ -228,85 +232,10 @@ PyuTest.make_ore("pyutest_ores:iron", "Iron", "ingot", "Ingot", {
   block_tiles = {"pyutest-metal.png"}
 })
 
-PyuTest.make_ore("pyutest_ores:copper", "Copper", "ingot", "Ingot", {
-  scarcity = 11 * 11 * 11,
-  y_max = 18,
-
-  ore_strength = PyuTest.BLOCK_NORMAL,
-  ore_color = "darkgoldenrod",
-
-  item_texture = "pyutest-ingot.png",
-  item_conf = {
-    color = "darkgoldenrod",
-  },
-
-  make_raw = true,
-  raw_texture = "pyutest-lump.png",
-  raw_conf = {
-    color = "darkgoldenrod"
-  },
-
-  block_tiles = {"pyutest-metal.png"},
-  block_color = "darkgoldenrod"
-})
-
-PyuTest.make_ore("pyutest_ores:gold", "Gold", "ingot", "Ingot", {
-  scarcity = 15.5 * 15.5 * 15.5,
-  y_max = -35,
-
-  ore_strength = PyuTest.BLOCK_NORMAL,
-  ore_color = "gold",
-
-  item_texture = "pyutest-ingot.png",
-  item_conf = {
-    color = "gold"
-  },
-
-  make_raw = true,
-  raw_texture = "pyutest-lump.png",
-  raw_conf = {
-    color = "gold"
-  },
-
-  block_tiles = {"pyutest-metal.png"},
-  block_color = "gold"
-})
-
-PyuTest.make_ore("pyutest_ores:diamond", "Diamond", "shard", "Shard", {
-  scarcity = 16.7 * 16.7 * 16.7,
-  y_max = -50,
-
-  ore_strength = PyuTest.BLOCK_NORMAL,
-  ore_color = "cyan",
-
-  item_texture = "pyutest-shard.png",
-  item_conf = {
-    color = "cyan"
-  },
-
-  block_tiles = {"pyutest-metal.png"},
-  block_color = "cyan"
-})
-
-PyuTest.make_ore("pyutest_ores:emerald", "Emerald", "shard", "Shard", {
-  scarcity = 18.3 * 18.3 * 18.3,
-  y_max = -50,
-
-  ore_strength = PyuTest.BLOCK_NORMAL,
-  ore_color = "seagreen",
-
-  item_texture = "pyutest-shard.png",
-  item_conf = {
-    color = "seagreen"
-  },
-
-  block_tiles = {"pyutest-metal.png"},
-  block_color = "seagreen"
-})
-
-PyuTest.make_ore("pyutest_ores:zinc", "Zinc", "ingot", "Ingot", {
+PyuTest.make_ore_and_item("pyutest_ores:zinc", "Zinc", "ingot", "Ingot", {
   scarcity = 11 * 11 * 11,
   y_max = 18,
+  wherein = PyuTest.ORE_STONES,
 
   ore_strength = PyuTest.BLOCK_NORMAL,
   ore_color = "#bed3d4",
@@ -326,26 +255,107 @@ PyuTest.make_ore("pyutest_ores:zinc", "Zinc", "ingot", "Ingot", {
   block_color = "#bed3d4"
 })
 
--- "Secondary" Ores
-
-PyuTest.make_ore("pyutest_ores:tin", "Tin", "ingot", "Ingot", {
+PyuTest.make_ore_and_item("pyutest_ores:copper", "Copper", "ingot", "Ingot", {
   scarcity = 11 * 11 * 11,
   y_max = 18,
+  wherein = PyuTest.ORE_STONES,
 
   ore_strength = PyuTest.BLOCK_NORMAL,
-  ore_color = "#8e8591",
+  ore_color = "darkgoldenrod",
 
   item_texture = "pyutest-ingot.png",
   item_conf = {
-    color = "#8e8591"
+    color = "darkgoldenrod",
   },
 
   make_raw = true,
   raw_texture = "pyutest-lump.png",
   raw_conf = {
-    color = "#8e8591"
+    color = "darkgoldenrod"
   },
 
   block_tiles = {"pyutest-metal.png"},
-  block_color = "#8e8591"
+  block_color = "darkgoldenrod"
+})
+
+PyuTest.make_ore_and_item("pyutest_ores:gold", "Gold", "ingot", "Ingot", {
+  scarcity = 15.5 * 15.5 * 15.5,
+  y_max = -35,
+  wherein = PyuTest.ORE_STONES,
+
+  ore_strength = PyuTest.BLOCK_NORMAL,
+  ore_color = "gold",
+
+  item_texture = "pyutest-ingot.png",
+  item_conf = {
+    color = "gold"
+  },
+
+  make_raw = true,
+  raw_texture = "pyutest-lump.png",
+  raw_conf = {
+    color = "gold"
+  },
+
+  block_tiles = {"pyutest-metal.png"},
+  block_color = "gold"
+})
+
+PyuTest.make_ore_and_item("pyutest_ores:diamond", "Diamond", "shard", "Shard", {
+  scarcity = 16.7 * 16.7 * 16.7,
+  y_max = -50,
+  wherein = PyuTest.ORE_STONES,
+
+  ore_strength = PyuTest.BLOCK_NORMAL,
+  ore_color = "cyan",
+
+  item_texture = "pyutest-shard.png",
+  item_conf = {
+    color = "cyan"
+  },
+
+  block_tiles = {"pyutest-metal.png"},
+  block_color = "cyan"
+})
+
+PyuTest.make_ore_and_item("pyutest_ores:emerald", "Emerald", "shard", "Shard", {
+  scarcity = 18.3 * 18.3 * 18.3,
+  y_max = -50,
+  wherein = PyuTest.ORE_STONES,
+
+  ore_strength = PyuTest.BLOCK_NORMAL,
+  ore_color = "seagreen",
+
+  item_texture = "pyutest-shard.png",
+  item_conf = {
+    color = "seagreen"
+  },
+
+  block_tiles = {"pyutest-metal.png"},
+  block_color = "seagreen"
+})
+
+-- "Secondary" Ores
+
+PyuTest.make_ore_and_item("pyutest_ores:tin", "Tin", "ingot", "Ingot", {
+  scarcity = 11 * 11 * 11,
+  y_max = 18,
+  wherein = PyuTest.ORE_STONES,
+
+  ore_strength = PyuTest.BLOCK_NORMAL,
+  ore_color = "#686569",
+
+  item_texture = "pyutest-ingot.png",
+  item_conf = {
+    color = "#686569"
+  },
+
+  make_raw = true,
+  raw_texture = "pyutest-lump.png",
+  raw_conf = {
+    color = "#686569"
+  },
+
+  block_tiles = {"pyutest-metal.png"},
+  block_color = "#686569"
 })
diff --git a/mods/MAPGEN/pyutest_worlds/api.lua b/mods/MAPGEN/pyutest_worlds/api.lua
index 17dac49..19b3be5 100644
--- a/mods/MAPGEN/pyutest_worlds/api.lua
+++ b/mods/MAPGEN/pyutest_worlds/api.lua
@@ -20,6 +20,26 @@ PyuTest.register_world = function (options)
     error("Please supply 'name' in the options table!")
   end
 
+  minetest.register_decoration({
+    deco_type = "simple",
+    decoration = "pyutest_blocks:bedrock",
+    sidelen = 8,
+    fill_ratio = 10,
+    y_min = conf.y_max,
+    y_max = conf.y_max,
+    flags = "force_placement"
+  })
+
+  minetest.register_decoration({
+    deco_type = "simple",
+    decoration = "pyutest_blocks:bedrock",
+    sidelen = 8,
+    fill_ratio = 10,
+    y_min = conf.y_min,
+    y_max = conf.y_min,
+    flags = "force_placement"
+  })
+
   local World = {
     name = conf.name,
     y_max = conf.y_max,
diff --git a/mods/MAPGEN/pyutest_worlds/ice.lua b/mods/MAPGEN/pyutest_worlds/ice.lua
index 85378b6..83ef53f 100644
--- a/mods/MAPGEN/pyutest_worlds/ice.lua
+++ b/mods/MAPGEN/pyutest_worlds/ice.lua
@@ -1,7 +1,7 @@
 PyuTest.IceWorld = PyuTest.register_world({
   name = "ice_world",
   y_max = -1000,
-  y_min = -2000
+  y_min = -1999
 })
 PyuTest.IceWorld:create_token("pyutest_worlds:ice_world_token", "Ice World", "#cbdbfc", "pyutest_blocks:ice_block")
 
diff --git a/mods/MAPGEN/pyutest_worlds/lava.lua b/mods/MAPGEN/pyutest_worlds/lava.lua
index 5013e81..70d72c8 100644
--- a/mods/MAPGEN/pyutest_worlds/lava.lua
+++ b/mods/MAPGEN/pyutest_worlds/lava.lua
@@ -1,7 +1,7 @@
 PyuTest.LavaWorld = PyuTest.register_world({
   name = "lava_world",
-  y_max = -3002,
-  y_min = -4002
+  y_max = -3000,
+  y_min = -3999
 })
 PyuTest.LavaWorld:create_token("pyutest_worlds:lava_world_token", "Lava World", "#511e1e", "pyutest_tools:ash")
 
@@ -44,13 +44,3 @@ PyuTest.LavaWorld:register_ore({
   biomes = {lava_cavern},
   noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS
 })
-
--- PyuTest.LavaWorld:register_decoration({
---   deco_type = "simple",
---   sidelen = 16,
---   fill_ratio = 0.00063,
---   decoration = {"pyutest_blocks:lava_source"},
---   place_on = {"pyutest_blocks:molten_rock_block", "pyutest_blocks:magma"},
---   biomes = {lava_cavern},
---   flags = "all_ceilings"
--- })
diff --git a/mods/MAPGEN/pyutest_worlds/mod.conf b/mods/MAPGEN/pyutest_worlds/mod.conf
index 864c53b..e115218 100644
--- a/mods/MAPGEN/pyutest_worlds/mod.conf
+++ b/mods/MAPGEN/pyutest_worlds/mod.conf
@@ -1 +1 @@
-depends = pyutest_tools,pyutest_blocks
+depends = pyutest_tools,pyutest_blocks,pyutest_ores
diff --git a/mods/MAPGEN/pyutest_worlds/mushroom.lua b/mods/MAPGEN/pyutest_worlds/mushroom.lua
index b2e253d..ad46612 100644
--- a/mods/MAPGEN/pyutest_worlds/mushroom.lua
+++ b/mods/MAPGEN/pyutest_worlds/mushroom.lua
@@ -1,7 +1,7 @@
 PyuTest.MushroomWorld = PyuTest.register_world({
   name = "mushroom_world",
-  y_max = -4003,
-  y_min = -5003
+  y_max = -4000,
+  y_min = -4999
 })
 PyuTest.MushroomWorld:create_token("pyutest_worlds:mushroom_world_token", "Mushroom World", "#ac324c", "pyutest_blocks:mushroom_block")
 
diff --git a/mods/MAPGEN/pyutest_worlds/slime.lua b/mods/MAPGEN/pyutest_worlds/slime.lua
index 5cdfa33..74ce8ea 100644
--- a/mods/MAPGEN/pyutest_worlds/slime.lua
+++ b/mods/MAPGEN/pyutest_worlds/slime.lua
@@ -1,7 +1,7 @@
 PyuTest.SlimeWorld = PyuTest.register_world({
   name = "slime_world",
-  y_max = -2001,
-  y_min = -3001
+  y_max = -2000,
+  y_min = -2999
 })
 PyuTest.SlimeWorld:create_token("pyutest_worlds:slime_world_token", "Slime World", "#7dbd3f", "pyutest_blocks:slime_block")
 
diff --git a/textures/pyutest-acid.png b/textures/pyutest-acid.png
index 5e5c3c0..8719e5a 100644
Binary files a/textures/pyutest-acid.png and b/textures/pyutest-acid.png differ
diff --git a/textures/pyutest-aspen-leaves.png b/textures/pyutest-aspen-leaves.png
deleted file mode 100644
index d49af43..0000000
Binary files a/textures/pyutest-aspen-leaves.png and /dev/null differ
diff --git a/textures/pyutest-basalt.png b/textures/pyutest-basalt.png
index 4c6c5a6..a4daa91 100644
Binary files a/textures/pyutest-basalt.png and b/textures/pyutest-basalt.png differ
diff --git a/textures/pyutest-bedrock.png b/textures/pyutest-bedrock.png
new file mode 100644
index 0000000..a3e611e
Binary files /dev/null and b/textures/pyutest-bedrock.png differ
diff --git a/textures/pyutest-birch-log.png b/textures/pyutest-birch-log.png
index 2b19bbf..f49b597 100644
Binary files a/textures/pyutest-birch-log.png and b/textures/pyutest-birch-log.png differ
diff --git a/textures/pyutest-bone-block-top-bottom.png b/textures/pyutest-bone-block-top-bottom.png
index e06af06..26b632f 100644
Binary files a/textures/pyutest-bone-block-top-bottom.png and b/textures/pyutest-bone-block-top-bottom.png differ
diff --git a/textures/pyutest-bone-block.png b/textures/pyutest-bone-block.png
index f2607ca..5625649 100644
Binary files a/textures/pyutest-bone-block.png and b/textures/pyutest-bone-block.png differ
diff --git a/textures/pyutest-cherry-leaves.png b/textures/pyutest-cherry-leaves.png
deleted file mode 100644
index 243b202..0000000
Binary files a/textures/pyutest-cherry-leaves.png and /dev/null differ
diff --git a/textures/pyutest-cherry-log.png b/textures/pyutest-cherry-log.png
index 4eba659..6716dd6 100644
Binary files a/textures/pyutest-cherry-log.png and b/textures/pyutest-cherry-log.png differ
diff --git a/textures/pyutest-crystal-lantern.png b/textures/pyutest-crystal-lantern.png
index b5cb625..07c38c8 100644
Binary files a/textures/pyutest-crystal-lantern.png and b/textures/pyutest-crystal-lantern.png differ
diff --git a/textures/pyutest-dark-leaves.png b/textures/pyutest-dark-leaves.png
deleted file mode 100644
index 2ff8f29..0000000
Binary files a/textures/pyutest-dark-leaves.png and /dev/null differ
diff --git a/textures/pyutest-darkstone.png b/textures/pyutest-darkstone.png
index 33543ba..3ab3257 100644
Binary files a/textures/pyutest-darkstone.png and b/textures/pyutest-darkstone.png differ
diff --git a/textures/pyutest-enchanted-obsidian.png b/textures/pyutest-enchanted-obsidian.png
deleted file mode 100644
index 6455ebf..0000000
Binary files a/textures/pyutest-enchanted-obsidian.png and /dev/null differ
diff --git a/textures/pyutest-glass.png b/textures/pyutest-glass.png
index 1bfbd9a..ee0cf0b 100644
Binary files a/textures/pyutest-glass.png and b/textures/pyutest-glass.png differ
diff --git a/textures/pyutest-glowslime.png b/textures/pyutest-glowslime.png
deleted file mode 100644
index 8311e7c..0000000
Binary files a/textures/pyutest-glowslime.png and /dev/null differ
diff --git a/textures/pyutest-grass.png b/textures/pyutest-grass.png
deleted file mode 100644
index 0057e1f..0000000
Binary files a/textures/pyutest-grass.png and /dev/null differ
diff --git a/textures/pyutest-haybale-top-bottom.png b/textures/pyutest-haybale-top-bottom.png
index ea6d1c3..94069b4 100644
Binary files a/textures/pyutest-haybale-top-bottom.png and b/textures/pyutest-haybale-top-bottom.png differ
diff --git a/textures/pyutest-haybale.png b/textures/pyutest-haybale.png
index 9ca8885..8b60c2e 100644
Binary files a/textures/pyutest-haybale.png and b/textures/pyutest-haybale.png differ
diff --git a/textures/pyutest-jungle-grass.png b/textures/pyutest-jungle-grass.png
deleted file mode 100644
index 6e33988..0000000
Binary files a/textures/pyutest-jungle-grass.png and /dev/null differ
diff --git a/textures/pyutest-jungle-log.png b/textures/pyutest-jungle-log.png
index 720e34c..d005735 100644
Binary files a/textures/pyutest-jungle-log.png and b/textures/pyutest-jungle-log.png differ
diff --git a/textures/pyutest-leaves.png b/textures/pyutest-leaves.png
index 5b1b781..98ca810 100644
Binary files a/textures/pyutest-leaves.png and b/textures/pyutest-leaves.png differ
diff --git a/textures/pyutest-log.png b/textures/pyutest-log.png
index d8a938f..8808a87 100644
Binary files a/textures/pyutest-log.png and b/textures/pyutest-log.png differ
diff --git a/textures/pyutest-mushroom-stem.png b/textures/pyutest-mushroom-stem.png
index 266fa17..5c5339c 100644
Binary files a/textures/pyutest-mushroom-stem.png and b/textures/pyutest-mushroom-stem.png differ
diff --git a/textures/pyutest-mushroom.png b/textures/pyutest-mushroom.png
index 6b543a9..38c951a 100644
Binary files a/textures/pyutest-mushroom.png and b/textures/pyutest-mushroom.png differ
diff --git a/textures/pyutest-mycelium.png b/textures/pyutest-mycelium.png
deleted file mode 100644
index 7d4935b..0000000
Binary files a/textures/pyutest-mycelium.png and /dev/null differ
diff --git a/textures/pyutest-obsidian.png b/textures/pyutest-obsidian.png
index 353ad9d..14df633 100644
Binary files a/textures/pyutest-obsidian.png and b/textures/pyutest-obsidian.png differ
diff --git a/textures/pyutest-ore-amethyst.png b/textures/pyutest-ore-amethyst.png
deleted file mode 100644
index ac703a6..0000000
Binary files a/textures/pyutest-ore-amethyst.png and /dev/null differ
diff --git a/textures/pyutest-ore-coal.png b/textures/pyutest-ore-coal.png
deleted file mode 100644
index 5a2c9f6..0000000
Binary files a/textures/pyutest-ore-coal.png and /dev/null differ
diff --git a/textures/pyutest-ore-copper.png b/textures/pyutest-ore-copper.png
deleted file mode 100644
index b73f836..0000000
Binary files a/textures/pyutest-ore-copper.png and /dev/null differ
diff --git a/textures/pyutest-ore-diamond.png b/textures/pyutest-ore-diamond.png
deleted file mode 100644
index bd73159..0000000
Binary files a/textures/pyutest-ore-diamond.png and /dev/null differ
diff --git a/textures/pyutest-ore-emerald.png b/textures/pyutest-ore-emerald.png
deleted file mode 100644
index 18aa3e6..0000000
Binary files a/textures/pyutest-ore-emerald.png and /dev/null differ
diff --git a/textures/pyutest-ore-gold.png b/textures/pyutest-ore-gold.png
deleted file mode 100644
index 6e2a6de..0000000
Binary files a/textures/pyutest-ore-gold.png and /dev/null differ
diff --git a/textures/pyutest-ore-iron.png b/textures/pyutest-ore-iron.png
deleted file mode 100644
index b8cff05..0000000
Binary files a/textures/pyutest-ore-iron.png and /dev/null differ
diff --git a/textures/pyutest-ore-lapis.png b/textures/pyutest-ore-lapis.png
deleted file mode 100644
index 93424ca..0000000
Binary files a/textures/pyutest-ore-lapis.png and /dev/null differ
diff --git a/textures/pyutest-ore-pink-quartz.png b/textures/pyutest-ore-pink-quartz.png
deleted file mode 100644
index e6f35bc..0000000
Binary files a/textures/pyutest-ore-pink-quartz.png and /dev/null differ
diff --git a/textures/pyutest-ore-ruby.png b/textures/pyutest-ore-ruby.png
deleted file mode 100644
index fb4e49c..0000000
Binary files a/textures/pyutest-ore-ruby.png and /dev/null differ
diff --git a/textures/pyutest-ore-tin.png b/textures/pyutest-ore-tin.png
deleted file mode 100644
index 500462b..0000000
Binary files a/textures/pyutest-ore-tin.png and /dev/null differ
diff --git a/textures/pyutest-ore-zinc.png b/textures/pyutest-ore-zinc.png
deleted file mode 100644
index 9e304eb..0000000
Binary files a/textures/pyutest-ore-zinc.png and /dev/null differ
diff --git a/textures/pyutest-purple-mushroom.png b/textures/pyutest-purple-mushroom.png
index 2f8d16f..59e6f50 100644
Binary files a/textures/pyutest-purple-mushroom.png and b/textures/pyutest-purple-mushroom.png differ
diff --git a/textures/pyutest-red-aspen-leaves.png b/textures/pyutest-red-aspen-leaves.png
deleted file mode 100644
index ab75d78..0000000
Binary files a/textures/pyutest-red-aspen-leaves.png and /dev/null differ
diff --git a/textures/pyutest-redwood-log.png b/textures/pyutest-redwood-log.png
index eb61f02..9d781d7 100644
Binary files a/textures/pyutest-redwood-log.png and b/textures/pyutest-redwood-log.png differ
diff --git a/textures/pyutest-sapling.png b/textures/pyutest-sapling.png
deleted file mode 100644
index 66663bf..0000000
Binary files a/textures/pyutest-sapling.png and /dev/null differ
diff --git a/textures/pyutest-savanna-grass.png b/textures/pyutest-savanna-grass.png
deleted file mode 100644
index 6de8dd5..0000000
Binary files a/textures/pyutest-savanna-grass.png and /dev/null differ
diff --git a/textures/pyutest-savanna-log.png b/textures/pyutest-savanna-log.png
index ec561f8..88e0678 100644
Binary files a/textures/pyutest-savanna-log.png and b/textures/pyutest-savanna-log.png differ
diff --git a/textures/pyutest-slime.png b/textures/pyutest-slime.png
index 8311e7c..f041e31 100644
Binary files a/textures/pyutest-slime.png and b/textures/pyutest-slime.png differ
diff --git a/textures/pyutest-snowy-leaves.png b/textures/pyutest-snowy-leaves.png
deleted file mode 100644
index fc42eb7..0000000
Binary files a/textures/pyutest-snowy-leaves.png and /dev/null differ
diff --git a/textures/pyutest-swampy-grass.png b/textures/pyutest-swampy-grass.png
deleted file mode 100644
index 91d793d..0000000
Binary files a/textures/pyutest-swampy-grass.png and /dev/null differ
diff --git a/textures/pyutest-vyn-leaves.png b/textures/pyutest-vyn-leaves.png
deleted file mode 100644
index a8db772..0000000
Binary files a/textures/pyutest-vyn-leaves.png and /dev/null differ
diff --git a/textures/pyutest-vyn-log-top-bottom.png b/textures/pyutest-vyn-log-top-bottom.png
deleted file mode 100644
index 29f325f..0000000
Binary files a/textures/pyutest-vyn-log-top-bottom.png and /dev/null differ
diff --git a/textures/pyutest-vyn-log.png b/textures/pyutest-vyn-log.png
deleted file mode 100644
index 0b10f4b..0000000
Binary files a/textures/pyutest-vyn-log.png and /dev/null differ
diff --git a/textures/pyutest-vyn-wood.png b/textures/pyutest-vyn-wood.png
deleted file mode 100644
index 5f4c39f..0000000
Binary files a/textures/pyutest-vyn-wood.png and /dev/null differ