diff --git a/mods/default/README.txt b/mods/default/README.txt
index 1bc899b..8642b39 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -101,7 +101,8 @@ paramat (CC BY-SA 3.0):
   default_dry_grass.png
   default_dry_grass_side.png
   default_dry_grass_*.png
-  default_grass_side.png -- Derived from a texture by TumeniNodes (CC-BY-SA 3.0)
+  default_grass.png
+  default_grass_side.png
   default_mese_block.png
   default_silver_sand.png
   default_mese_post_light_side.png
@@ -128,8 +129,6 @@ TumeniNodes (CC BY-SA 3.0):
   default_desert_cobble.png -- Derived from a texture by brunob.santos (CC BY-SA 3.0)
   default_coniferous_litter.png
   default_coniferous_litter_side.png
-  default_grass.png
-  default_dry_dirt.png
 
 BlockMen (CC BY-SA 3.0):
   default_aspen_leaves.png -- Derived from Sofar's texture
diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 9481133..b49dc48 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -1,51 +1,51 @@
 -- mods/default/crafting.lua
 
 minetest.register_craft({
-	output = "default:wood 4",
+	output = 'default:wood 4',
 	recipe = {
-		{"default:tree"},
+		{'default:tree'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:junglewood 4",
+	output = 'default:junglewood 4',
 	recipe = {
-		{"default:jungletree"},
+		{'default:jungletree'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:pine_wood 4",
+	output = 'default:pine_wood 4',
 	recipe = {
-		{"default:pine_tree"},
+		{'default:pine_tree'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:acacia_wood 4",
+	output = 'default:acacia_wood 4',
 	recipe = {
-		{"default:acacia_tree"},
+		{'default:acacia_tree'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:aspen_wood 4",
+	output = 'default:aspen_wood 4',
 	recipe = {
-		{"default:aspen_tree"},
+		{'default:aspen_tree'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:wood",
+	output = 'default:wood',
 	recipe = {
-		{"default:bush_stem"},
+		{'default:bush_stem'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:acacia_wood",
+	output = 'default:acacia_wood',
 	recipe = {
-		{"default:acacia_bush_stem"},
+		{'default:acacia_bush_stem'},
 	}
 })
 
@@ -57,143 +57,143 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:stick 4",
+	output = 'default:stick 4',
 	recipe = {
-		{"group:wood"},
+		{'group:wood'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:sign_wall_steel 3",
+	output = 'default:sign_wall_steel 3',
 	recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"", "group:stick", ""},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = "default:sign_wall_wood 3",
+	output = 'default:sign_wall_wood 3',
 	recipe = {
-		{"group:wood", "group:wood", "group:wood"},
-		{"group:wood", "group:wood", "group:wood"},
-		{"", "group:stick", ""},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = "default:torch 4",
+	output = 'default:torch 4',
 	recipe = {
-		{"default:coal_lump"},
-		{"group:stick"},
+		{'default:coal_lump'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:pick_wood",
+	output = 'default:pick_wood',
 	recipe = {
-		{"group:wood", "group:wood", "group:wood"},
-		{"", "group:stick", ""},
-		{"", "group:stick", ""},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = "default:pick_stone",
+	output = 'default:pick_stone',
 	recipe = {
-		{"group:stone", "group:stone", "group:stone"},
-		{"", "group:stick", ""},
-		{"", "group:stick", ""},
+		{'group:stone', 'group:stone', 'group:stone'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = "default:pick_steel",
+	output = 'default:pick_steel',
 	recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"", "group:stick", ""},
-		{"", "group:stick", ""},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = "default:pick_bronze",
+	output = 'default:pick_bronze',
 	recipe = {
-		{"default:bronze_ingot", "default:bronze_ingot", "default:bronze_ingot"},
-		{"", "group:stick", ""},
-		{"", "group:stick", ""},
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = "default:pick_mese",
+	output = 'default:pick_mese',
 	recipe = {
-		{"default:mese_crystal", "default:mese_crystal", "default:mese_crystal"},
-		{"", "group:stick", ""},
-		{"", "group:stick", ""},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = "default:pick_diamond",
+	output = 'default:pick_diamond',
 	recipe = {
-		{"default:diamond", "default:diamond", "default:diamond"},
-		{"", "group:stick", ""},
-		{"", "group:stick", ""},
+		{'default:diamond', 'default:diamond', 'default:diamond'},
+		{'', 'group:stick', ''},
+		{'', 'group:stick', ''},
 	}
 })
 
 minetest.register_craft({
-	output = "default:shovel_wood",
+	output = 'default:shovel_wood',
 	recipe = {
-		{"group:wood"},
-		{"group:stick"},
-		{"group:stick"},
+		{'group:wood'},
+		{'group:stick'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:shovel_stone",
+	output = 'default:shovel_stone',
 	recipe = {
-		{"group:stone"},
-		{"group:stick"},
-		{"group:stick"},
+		{'group:stone'},
+		{'group:stick'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:shovel_steel",
+	output = 'default:shovel_steel',
 	recipe = {
-		{"default:steel_ingot"},
-		{"group:stick"},
-		{"group:stick"},
+		{'default:steel_ingot'},
+		{'group:stick'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:shovel_bronze",
+	output = 'default:shovel_bronze',
 	recipe = {
-		{"default:bronze_ingot"},
-		{"group:stick"},
-		{"group:stick"},
+		{'default:bronze_ingot'},
+		{'group:stick'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:shovel_mese",
+	output = 'default:shovel_mese',
 	recipe = {
-		{"default:mese_crystal"},
-		{"group:stick"},
-		{"group:stick"},
+		{'default:mese_crystal'},
+		{'group:stick'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:shovel_diamond",
+	output = 'default:shovel_diamond',
 	recipe = {
-		{"default:diamond"},
-		{"group:stick"},
-		{"group:stick"},
+		{'default:diamond'},
+		{'group:stick'},
+		{'group:stick'},
 	}
 })
 
@@ -201,135 +201,135 @@ minetest.register_craft({
 -- Recipes face left to match appearence in textures and inventory
 
 minetest.register_craft({
-	output = "default:axe_wood",
+	output = 'default:axe_wood',
 	recipe = {
-		{"group:wood", "group:wood"},
-		{"group:wood", "group:stick"},
-		{"", "group:stick"},
+		{'group:wood', 'group:wood'},
+		{'group:wood', 'group:stick'},
+		{'', 'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:axe_stone",
+	output = 'default:axe_stone',
 	recipe = {
-		{"group:stone", "group:stone"},
-		{"group:stone", "group:stick"},
-		{"", "group:stick"},
+		{'group:stone', 'group:stone'},
+		{'group:stone', 'group:stick'},
+		{'', 'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:axe_steel",
+	output = 'default:axe_steel',
 	recipe = {
-		{"default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "group:stick"},
-		{"", "group:stick"},
+		{'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'group:stick'},
+		{'', 'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:axe_bronze",
+	output = 'default:axe_bronze',
 	recipe = {
-		{"default:bronze_ingot", "default:bronze_ingot"},
-		{"default:bronze_ingot", "group:stick"},
-		{"", "group:stick"},
+		{'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:bronze_ingot', 'group:stick'},
+		{'', 'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:axe_mese",
+	output = 'default:axe_mese',
 	recipe = {
-		{"default:mese_crystal", "default:mese_crystal"},
-		{"default:mese_crystal", "group:stick"},
-		{"", "group:stick"},
+		{'default:mese_crystal', 'default:mese_crystal'},
+		{'default:mese_crystal', 'group:stick'},
+		{'', 'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:axe_diamond",
+	output = 'default:axe_diamond',
 	recipe = {
-		{"default:diamond", "default:diamond"},
-		{"default:diamond", "group:stick"},
-		{"", "group:stick"},
+		{'default:diamond', 'default:diamond'},
+		{'default:diamond', 'group:stick'},
+		{'', 'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:sword_wood",
+	output = 'default:sword_wood',
 	recipe = {
-		{"group:wood"},
-		{"group:wood"},
-		{"group:stick"},
+		{'group:wood'},
+		{'group:wood'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:sword_stone",
+	output = 'default:sword_stone',
 	recipe = {
-		{"group:stone"},
-		{"group:stone"},
-		{"group:stick"},
+		{'group:stone'},
+		{'group:stone'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:sword_steel",
+	output = 'default:sword_steel',
 	recipe = {
-		{"default:steel_ingot"},
-		{"default:steel_ingot"},
-		{"group:stick"},
+		{'default:steel_ingot'},
+		{'default:steel_ingot'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:sword_bronze",
+	output = 'default:sword_bronze',
 	recipe = {
-		{"default:bronze_ingot"},
-		{"default:bronze_ingot"},
-		{"group:stick"},
+		{'default:bronze_ingot'},
+		{'default:bronze_ingot'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:sword_mese",
+	output = 'default:sword_mese',
 	recipe = {
-		{"default:mese_crystal"},
-		{"default:mese_crystal"},
-		{"group:stick"},
+		{'default:mese_crystal'},
+		{'default:mese_crystal'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:sword_diamond",
+	output = 'default:sword_diamond',
 	recipe = {
-		{"default:diamond"},
-		{"default:diamond"},
-		{"group:stick"},
+		{'default:diamond'},
+		{'default:diamond'},
+		{'group:stick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:skeleton_key",
+	output = 'default:skeleton_key',
 	recipe = {
-		{"default:gold_ingot"},
+		{'default:gold_ingot'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:chest",
+	output = 'default:chest',
 	recipe = {
-		{"group:wood", "group:wood", "group:wood"},
-		{"group:wood", "", "group:wood"},
-		{"group:wood", "group:wood", "group:wood"},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'group:wood', '', 'group:wood'},
+		{'group:wood', 'group:wood', 'group:wood'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:chest_locked",
+	output = 'default:chest_locked',
 	recipe = {
-		{"group:wood", "group:wood", "group:wood"},
-		{"group:wood", "default:steel_ingot", "group:wood"},
-		{"group:wood", "group:wood", "group:wood"},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'group:wood', 'default:steel_ingot', 'group:wood'},
+		{'group:wood', 'group:wood', 'group:wood'},
 	}
 })
 
@@ -340,59 +340,59 @@ minetest.register_craft( {
 })
 
 minetest.register_craft({
-	output = "default:furnace",
+	output = 'default:furnace',
 	recipe = {
-		{"group:stone", "group:stone", "group:stone"},
-		{"group:stone", "", "group:stone"},
-		{"group:stone", "group:stone", "group:stone"},
+		{'group:stone', 'group:stone', 'group:stone'},
+		{'group:stone', '', 'group:stone'},
+		{'group:stone', 'group:stone', 'group:stone'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:coalblock",
+	output = 'default:coalblock',
 	recipe = {
-		{"default:coal_lump", "default:coal_lump", "default:coal_lump"},
-		{"default:coal_lump", "default:coal_lump", "default:coal_lump"},
-		{"default:coal_lump", "default:coal_lump", "default:coal_lump"},
+		{'default:coal_lump', 'default:coal_lump', 'default:coal_lump'},
+		{'default:coal_lump', 'default:coal_lump', 'default:coal_lump'},
+		{'default:coal_lump', 'default:coal_lump', 'default:coal_lump'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:coal_lump 9",
+	output = 'default:coal_lump 9',
 	recipe = {
-		{"default:coalblock"},
+		{'default:coalblock'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:steelblock",
+	output = 'default:steelblock',
 	recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:steel_ingot 9",
+	output = 'default:steel_ingot 9',
 	recipe = {
-		{"default:steelblock"},
+		{'default:steelblock'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:copperblock",
+	output = 'default:copperblock',
 	recipe = {
-		{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
-		{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
-		{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
+		{'default:copper_ingot', 'default:copper_ingot', 'default:copper_ingot'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:copper_ingot 9",
+	output = 'default:copper_ingot 9',
 	recipe = {
-		{"default:copperblock"},
+		{'default:copperblock'},
 	}
 })
 
@@ -422,50 +422,50 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:bronzeblock",
+	output = 'default:bronzeblock',
 	recipe = {
-		{"default:bronze_ingot", "default:bronze_ingot", "default:bronze_ingot"},
-		{"default:bronze_ingot", "default:bronze_ingot", "default:bronze_ingot"},
-		{"default:bronze_ingot", "default:bronze_ingot", "default:bronze_ingot"},
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
+		{'default:bronze_ingot', 'default:bronze_ingot', 'default:bronze_ingot'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:bronze_ingot 9",
+	output = 'default:bronze_ingot 9',
 	recipe = {
-		{"default:bronzeblock"},
+		{'default:bronzeblock'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:goldblock",
+	output = 'default:goldblock',
 	recipe = {
-		{"default:gold_ingot", "default:gold_ingot", "default:gold_ingot"},
-		{"default:gold_ingot", "default:gold_ingot", "default:gold_ingot"},
-		{"default:gold_ingot", "default:gold_ingot", "default:gold_ingot"},
+		{'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'},
+		{'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'},
+		{'default:gold_ingot', 'default:gold_ingot', 'default:gold_ingot'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:gold_ingot 9",
+	output = 'default:gold_ingot 9',
 	recipe = {
-		{"default:goldblock"},
+		{'default:goldblock'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:diamondblock",
+	output = 'default:diamondblock',
 	recipe = {
-		{"default:diamond", "default:diamond", "default:diamond"},
-		{"default:diamond", "default:diamond", "default:diamond"},
-		{"default:diamond", "default:diamond", "default:diamond"},
+		{'default:diamond', 'default:diamond', 'default:diamond'},
+		{'default:diamond', 'default:diamond', 'default:diamond'},
+		{'default:diamond', 'default:diamond', 'default:diamond'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:diamond 9",
+	output = 'default:diamond 9',
 	recipe = {
-		{"default:diamondblock"},
+		{'default:diamondblock'},
 	}
 })
 
@@ -566,57 +566,57 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:clay",
+	output = 'default:clay',
 	recipe = {
-		{"default:clay_lump", "default:clay_lump"},
-		{"default:clay_lump", "default:clay_lump"},
+		{'default:clay_lump', 'default:clay_lump'},
+		{'default:clay_lump', 'default:clay_lump'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:clay_lump 4",
+	output = 'default:clay_lump 4',
 	recipe = {
-		{"default:clay"},
+		{'default:clay'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:brick",
+	output = 'default:brick',
 	recipe = {
-		{"default:clay_brick", "default:clay_brick"},
-		{"default:clay_brick", "default:clay_brick"},
+		{'default:clay_brick', 'default:clay_brick'},
+		{'default:clay_brick', 'default:clay_brick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:clay_brick 4",
+	output = 'default:clay_brick 4',
 	recipe = {
-		{"default:brick"},
+		{'default:brick'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:paper",
+	output = 'default:paper',
 	recipe = {
-		{"default:papyrus", "default:papyrus", "default:papyrus"},
+		{'default:papyrus', 'default:papyrus', 'default:papyrus'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:book",
+	output = 'default:book',
 	recipe = {
-		{"default:paper"},
-		{"default:paper"},
-		{"default:paper"},
+		{'default:paper'},
+		{'default:paper'},
+		{'default:paper'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:bookshelf",
+	output = 'default:bookshelf',
 	recipe = {
-		{"group:wood", "group:wood", "group:wood"},
-		{"default:book", "default:book", "default:book"},
-		{"group:wood", "group:wood", "group:wood"},
+		{'group:wood', 'group:wood', 'group:wood'},
+		{'default:book', 'default:book', 'default:book'},
+		{'group:wood', 'group:wood', 'group:wood'},
 	}
 })
 
@@ -630,34 +630,34 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:ladder_steel 15",
+	output = 'default:ladder_steel 15',
 	recipe = {
-		{"default:steel_ingot", "", "default:steel_ingot"},
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "", "default:steel_ingot"},
+		{'default:steel_ingot', '', 'default:steel_ingot'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+		{'default:steel_ingot', '', 'default:steel_ingot'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:mese",
+	output = 'default:mese',
 	recipe = {
-		{"default:mese_crystal", "default:mese_crystal", "default:mese_crystal"},
-		{"default:mese_crystal", "default:mese_crystal", "default:mese_crystal"},
-		{"default:mese_crystal", "default:mese_crystal", "default:mese_crystal"},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+		{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:mese_crystal 9",
+	output = 'default:mese_crystal 9',
 	recipe = {
-		{"default:mese"},
+		{'default:mese'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:mese_crystal_fragment 9",
+	output = 'default:mese_crystal_fragment 9',
 	recipe = {
-		{"default:mese_crystal"},
+		{'default:mese_crystal'},
 	}
 })
 
@@ -671,10 +671,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:meselamp",
+	output = 'default:meselamp',
 	recipe = {
-		{"default:glass"},
-		{"default:mese_crystal"},
+		{'default:glass'},
+		{'default:mese_crystal'},
 	}
 })
 
@@ -688,85 +688,85 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "default:obsidian_shard 9",
+	output = 'default:obsidian_shard 9',
 	recipe = {
-		{"default:obsidian"}
+		{'default:obsidian'}
 	}
 })
 
 minetest.register_craft({
-	output = "default:obsidian",
+	output = 'default:obsidian',
 	recipe = {
-		{"default:obsidian_shard", "default:obsidian_shard", "default:obsidian_shard"},
-		{"default:obsidian_shard", "default:obsidian_shard", "default:obsidian_shard"},
-		{"default:obsidian_shard", "default:obsidian_shard", "default:obsidian_shard"},
+		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
+		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
+		{'default:obsidian_shard', 'default:obsidian_shard', 'default:obsidian_shard'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:obsidianbrick 4",
+	output = 'default:obsidianbrick 4',
 	recipe = {
-		{"default:obsidian", "default:obsidian"},
-		{"default:obsidian", "default:obsidian"}
+		{'default:obsidian', 'default:obsidian'},
+		{'default:obsidian', 'default:obsidian'}
 	}
 })
 
 minetest.register_craft({
-	output = "default:obsidian_block 9",
+	output = 'default:obsidian_block 9',
 	recipe = {
-		{"default:obsidian", "default:obsidian", "default:obsidian"},
-		{"default:obsidian", "default:obsidian", "default:obsidian"},
-		{"default:obsidian", "default:obsidian", "default:obsidian"},
+		{'default:obsidian', 'default:obsidian', 'default:obsidian'},
+		{'default:obsidian', 'default:obsidian', 'default:obsidian'},
+		{'default:obsidian', 'default:obsidian', 'default:obsidian'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:stonebrick 4",
+	output = 'default:stonebrick 4',
 	recipe = {
-		{"default:stone", "default:stone"},
-		{"default:stone", "default:stone"},
+		{'default:stone', 'default:stone'},
+		{'default:stone', 'default:stone'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:stone_block 9",
+	output = 'default:stone_block 9',
 	recipe = {
-		{"default:stone", "default:stone", "default:stone"},
-		{"default:stone", "default:stone", "default:stone"},
-		{"default:stone", "default:stone", "default:stone"},
+		{'default:stone', 'default:stone', 'default:stone'},
+		{'default:stone', 'default:stone', 'default:stone'},
+		{'default:stone', 'default:stone', 'default:stone'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:desert_stonebrick 4",
+	output = 'default:desert_stonebrick 4',
 	recipe = {
-		{"default:desert_stone", "default:desert_stone"},
-		{"default:desert_stone", "default:desert_stone"},
+		{'default:desert_stone', 'default:desert_stone'},
+		{'default:desert_stone', 'default:desert_stone'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:desert_stone_block 9",
+	output = 'default:desert_stone_block 9',
 	recipe = {
-		{"default:desert_stone", "default:desert_stone", "default:desert_stone"},
-		{"default:desert_stone", "default:desert_stone", "default:desert_stone"},
-		{"default:desert_stone", "default:desert_stone", "default:desert_stone"},
+		{'default:desert_stone', 'default:desert_stone', 'default:desert_stone'},
+		{'default:desert_stone', 'default:desert_stone', 'default:desert_stone'},
+		{'default:desert_stone', 'default:desert_stone', 'default:desert_stone'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:snowblock",
+	output = 'default:snowblock',
 	recipe = {
-		{"default:snow", "default:snow", "default:snow"},
-		{"default:snow", "default:snow", "default:snow"},
-		{"default:snow", "default:snow", "default:snow"},
+		{'default:snow', 'default:snow', 'default:snow'},
+		{'default:snow', 'default:snow', 'default:snow'},
+		{'default:snow', 'default:snow', 'default:snow'},
 	}
 })
 
 minetest.register_craft({
-	output = "default:snow 9",
+	output = 'default:snow 9',
 	recipe = {
-		{"default:snowblock"},
+		{'default:snowblock'},
 	}
 })
 
@@ -864,16 +864,16 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	type = "cooking",
-	output = "default:gold_ingot",
-	recipe = "default:skeleton_key",
+	type = 'cooking',
+	output = 'default:gold_ingot',
+	recipe = 'default:skeleton_key',
 	cooktime = 5,
 })
 
 minetest.register_craft({
-	type = "cooking",
-	output = "default:gold_ingot",
-	recipe = "default:key",
+	type = 'cooking',
+	output = 'default:gold_ingot',
+	recipe = 'default:key',
 	cooktime = 5,
 })
 
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index 53f4dec..6a1b570 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -262,17 +262,17 @@ minetest.register_craftitem("default:coal_lump", {
 
 minetest.register_craftitem("default:iron_lump", {
 	description = "Iron Lump",
-	inventory_image = "default_iron_lump.png"
+	inventory_image = "default_iron_lump.png",
 })
 
 minetest.register_craftitem("default:copper_lump", {
 	description = "Copper Lump",
-	inventory_image = "default_copper_lump.png"
+	inventory_image = "default_copper_lump.png",
 })
 
 minetest.register_craftitem("default:tin_lump", {
 	description = "Tin Lump",
-	inventory_image = "default_tin_lump.png"
+	inventory_image = "default_tin_lump.png",
 })
 
 minetest.register_craftitem("default:mese_crystal", {
@@ -282,7 +282,7 @@ minetest.register_craftitem("default:mese_crystal", {
 
 minetest.register_craftitem("default:gold_lump", {
 	description = "Gold Lump",
-	inventory_image = "default_gold_lump.png"
+	inventory_image = "default_gold_lump.png",
 })
 
 minetest.register_craftitem("default:diamond", {
@@ -297,22 +297,22 @@ minetest.register_craftitem("default:clay_lump", {
 
 minetest.register_craftitem("default:steel_ingot", {
 	description = "Steel Ingot",
-	inventory_image = "default_steel_ingot.png"
+	inventory_image = "default_steel_ingot.png",
 })
 
 minetest.register_craftitem("default:copper_ingot", {
 	description = "Copper Ingot",
-	inventory_image = "default_copper_ingot.png"
+	inventory_image = "default_copper_ingot.png",
 })
 
 minetest.register_craftitem("default:tin_ingot", {
 	description = "Tin Ingot",
-	inventory_image = "default_tin_ingot.png"
+	inventory_image = "default_tin_ingot.png",
 })
 
 minetest.register_craftitem("default:bronze_ingot", {
 	description = "Bronze Ingot",
-	inventory_image = "default_bronze_ingot.png"
+	inventory_image = "default_bronze_ingot.png",
 })
 
 minetest.register_craftitem("default:gold_ingot", {
@@ -343,6 +343,5 @@ minetest.register_craftitem("default:flint", {
 minetest.register_craftitem("default:blueberries", {
 	description = "Blueberries",
 	inventory_image = "default_blueberries.png",
-	groups = {food_blueberries = 1, food_berry = 1},
 	on_use = minetest.item_eat(2),
 })
diff --git a/mods/default/depends.txt b/mods/default/depends.txt
new file mode 100644
index 0000000..e1c3818
--- /dev/null
+++ b/mods/default/depends.txt
@@ -0,0 +1 @@
+player_api?
diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index ceeeedc..1165c89 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -477,6 +477,7 @@ minetest.register_abm({
 	neighbors = {
 		"air",
 		"group:grass",
+		"group:dry_grass",
 		"default:snow",
 	},
 	interval = 6,
@@ -503,8 +504,11 @@ minetest.register_abm({
 		-- Snow check is cheapest, so comes first
 		if name == "default:snow" then
 			minetest.set_node(pos, {name = "default:dirt_with_snow"})
+		-- Most likely case first
 		elseif minetest.get_item_group(name, "grass") ~= 0 then
 			minetest.set_node(pos, {name = "default:dirt_with_grass"})
+		elseif minetest.get_item_group(name, "dry_grass") ~= 0 then
+			minetest.set_node(pos, {name = "default:dirt_with_dry_grass"})
 		end
 	end
 })
@@ -516,7 +520,7 @@ minetest.register_abm({
 
 minetest.register_abm({
 	label = "Grass covered",
-	nodenames = {"group:spreading_dirt_type", "default:dry_dirt_with_dry_grass"},
+	nodenames = {"group:spreading_dirt_type"},
 	interval = 8,
 	chance = 50,
 	catch_up = false,
@@ -527,11 +531,7 @@ minetest.register_abm({
 		if name ~= "ignore" and nodedef and not ((nodedef.sunlight_propagates or
 				nodedef.paramtype == "light") and
 				nodedef.liquidtype == "none") then
-			if node.name == "default:dry_dirt_with_dry_grass" then
-				minetest.set_node(pos, {name = "default:dry_dirt"})
-			else
-				minetest.set_node(pos, {name = "default:dirt"})
-			end
+			minetest.set_node(pos, {name = "default:dirt"})
 		end
 	end
 })
@@ -541,27 +541,22 @@ minetest.register_abm({
 -- Moss growth on cobble near water
 --
 
-local moss_correspondences = {
-	["default:cobble"] = "default:mossycobble",
-	["stairs:slab_cobble"] = "stairs:slab_mossycobble",
-	["stairs:stair_cobble"] = "stairs:stair_mossycobble",
-	["stairs:stair_inner_cobble"] = "stairs:stair_inner_mossycobble",
-	["stairs:stair_outer_cobble"] = "stairs:stair_outer_mossycobble",
-	["walls:cobble"] = "walls:mossycobble",
-}
 minetest.register_abm({
 	label = "Moss growth",
-	nodenames = {"default:cobble", "stairs:slab_cobble", "stairs:stair_cobble",
-		"stairs:stair_inner_cobble", "stairs:stair_outer_cobble",
-		"walls:cobble"},
+	nodenames = {"default:cobble", "stairs:slab_cobble", "stairs:stair_cobble", "walls:cobble"},
 	neighbors = {"group:water"},
 	interval = 16,
 	chance = 200,
 	catch_up = false,
 	action = function(pos, node)
-		node.name = moss_correspondences[node.name]
-		if node.name then
-			minetest.set_node(pos, node)
+		if node.name == "default:cobble" then
+			minetest.set_node(pos, {name = "default:mossycobble"})
+		elseif node.name == "stairs:slab_cobble" then
+			minetest.set_node(pos, {name = "stairs:slab_mossycobble", param2 = node.param2})
+		elseif node.name == "stairs:stair_cobble" then
+			minetest.set_node(pos, {name = "stairs:stair_mossycobble", param2 = node.param2})
+		elseif node.name == "walls:cobble" then
+			minetest.set_node(pos, {name = "walls:mossycobble", param2 = node.param2})
 		end
 	end
 })
diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua
index e045080..a06f3b2 100644
--- a/mods/default/furnace.lua
+++ b/mods/default/furnace.lua
@@ -107,7 +107,6 @@ local function furnace_node_timer(pos, elapsed)
 
 	local inv = meta:get_inventory()
 	local srclist, fuellist
-	local dst_full = false
 
 	local cookable, cooked
 	local fuel
@@ -147,8 +146,6 @@ local function furnace_node_timer(pos, elapsed)
 						inv:set_stack("src", 1, aftercooked.items[1])
 						src_time = src_time - cooked.time
 						update = true
-					else
-						dst_full = true
 					end
 				else
 					-- Item could not be cooked: probably missing fuel
@@ -198,7 +195,7 @@ local function furnace_node_timer(pos, elapsed)
 	local item_percent = 0
 	if cookable then
 		item_percent = math.floor(src_time / cooked.time * 100)
-		if dst_full then
+		if item_percent > 100 then
 			item_state = "100% (output full)"
 		else
 			item_state = item_percent .. "%"
diff --git a/mods/default/init.lua b/mods/default/init.lua
index 4782752..b89fd0e 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -13,7 +13,6 @@ minetest.register_on_joinplayer(function(player)
 	player:set_formspec_prepend([[
 			bgcolor[#080808BB;true]
 			background[5,5;1,1;gui_formbg.png;true]
-			background[5,5;1,1;gui_formbg.png;true;10]
 			listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF] ]])
 end)
 
diff --git a/mods/default/legacy.lua b/mods/default/legacy.lua
index a2d812d..935d857 100644
--- a/mods/default/legacy.lua
+++ b/mods/default/legacy.lua
@@ -45,5 +45,5 @@ default.register_chest = default.chest.register_chest
 function default.intersects_protection(minp, maxp, player_name, interval)
 	minetest.log("warning", "default.intersects_protection() is " ..
 		"deprecated, use minetest.is_area_protected() instead.")
-	return minetest.is_area_protected(minp, maxp, player_name, interval)
+	minetest.is_area_protected(minp, maxp, player_name, interval)
 end
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 6d68afc..9c63d1e 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -2,18 +2,13 @@
 -- Aliases for map generators
 --
 
--- All mapgens
-
 minetest.register_alias("mapgen_stone", "default:stone")
-minetest.register_alias("mapgen_water_source", "default:water_source")
-minetest.register_alias("mapgen_river_water_source", "default:river_water_source")
-
--- Additional aliases needed for mapgen v6
-
-minetest.register_alias("mapgen_lava_source", "default:lava_source")
 minetest.register_alias("mapgen_dirt", "default:dirt")
 minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
 minetest.register_alias("mapgen_sand", "default:sand")
+minetest.register_alias("mapgen_water_source", "default:water_source")
+minetest.register_alias("mapgen_river_water_source", "default:river_water_source")
+minetest.register_alias("mapgen_lava_source", "default:lava_source")
 minetest.register_alias("mapgen_gravel", "default:gravel")
 minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
 minetest.register_alias("mapgen_desert_sand", "default:desert_sand")
@@ -21,6 +16,9 @@ minetest.register_alias("mapgen_dirt_with_snow", "default:dirt_with_snow")
 minetest.register_alias("mapgen_snowblock", "default:snowblock")
 minetest.register_alias("mapgen_snow", "default:snow")
 minetest.register_alias("mapgen_ice", "default:ice")
+minetest.register_alias("mapgen_sandstone", "default:sandstone")
+
+-- Flora
 
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
@@ -31,10 +29,14 @@ minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
 minetest.register_alias("mapgen_pine_tree", "default:pine_tree")
 minetest.register_alias("mapgen_pine_needles", "default:pine_needles")
 
+-- Dungeons
+
 minetest.register_alias("mapgen_cobble", "default:cobble")
 minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
 minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
 minetest.register_alias("mapgen_stair_desert_stone", "stairs:stair_desert_stone")
+minetest.register_alias("mapgen_sandstonebrick", "default:sandstonebrick")
+minetest.register_alias("mapgen_stair_sandstone_block", "stairs:stair_sandstone_block")
 
 
 --
@@ -552,6 +554,14 @@ function default.register_ores()
 			octaves = 1,
 			persist = 0.0
 		},
+		biomes = {"icesheet_ocean", "tundra", "tundra_beach", "tundra_ocean",
+			"taiga", "taiga_ocean", "snowy_grassland", "snowy_grassland_ocean",
+			"grassland", "grassland_dunes", "grassland_ocean", "coniferous_forest",
+			"coniferous_forest_dunes", "coniferous_forest_ocean", "deciduous_forest",
+			"deciduous_forest_shore", "deciduous_forest_ocean", "cold_desert",
+			"cold_desert_ocean", "savanna", "savanna_shore", "savanna_ocean",
+			"rainforest", "rainforest_swamp", "rainforest_ocean", "underground",
+			"floatland_coniferous_forest", "floatland_coniferous_forest_ocean"}
 	})
 
 	-- Dirt
@@ -573,10 +583,9 @@ function default.register_ores()
 			octaves = 1,
 			persist = 0.0
 		},
-		-- Only where default:dirt is present as surface material
 		biomes = {"taiga", "snowy_grassland", "grassland", "coniferous_forest",
-				"deciduous_forest", "deciduous_forest_shore", "rainforest",
-				"rainforest_swamp", "floatland_coniferous_forest"}
+			"deciduous_forest", "deciduous_forest_shore", "savanna", "savanna_shore",
+			"rainforest", "rainforest_swamp", "floatland_coniferous_forest"}
 	})
 
 	-- Gravel
@@ -598,6 +607,14 @@ function default.register_ores()
 			octaves = 1,
 			persist = 0.0
 		},
+		biomes = {"icesheet_ocean", "tundra", "tundra_beach", "tundra_ocean",
+			"taiga", "taiga_ocean", "snowy_grassland", "snowy_grassland_ocean",
+			"grassland", "grassland_dunes", "grassland_ocean", "coniferous_forest",
+			"coniferous_forest_dunes", "coniferous_forest_ocean", "deciduous_forest",
+			"deciduous_forest_shore", "deciduous_forest_ocean", "cold_desert",
+			"cold_desert_ocean", "savanna", "savanna_shore", "savanna_ocean",
+			"rainforest", "rainforest_swamp", "rainforest_ocean", "underground",
+			"floatland_coniferous_forest", "floatland_coniferous_forest_ocean"}
 	})
 
 	-- Scatter ores
@@ -907,8 +924,6 @@ function default.register_biomes(upper_limit)
 		node_river_water = "default:ice",
 		node_riverbed = "default:gravel",
 		depth_riverbed = 2,
-		node_dungeon = "default:ice",
-		node_dungeon_stair = "stairs:stair_ice",
 		y_max = upper_limit,
 		y_min = -8,
 		heat_point = 0,
@@ -924,24 +939,8 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_water_top = "default:ice",
 		depth_water_top = 10,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = -9,
-		y_min = -255,
-		heat_point = 0,
-		humidity_point = 73,
-	})
-
-	minetest.register_biome({
-		name = "icesheet_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 0,
 		humidity_point = 73,
 	})
@@ -953,9 +952,6 @@ function default.register_biomes(upper_limit)
 		node_dust = "default:snow",
 		node_riverbed = "default:gravel",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 47,
 		heat_point = 0,
@@ -970,9 +966,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 1,
 		node_riverbed = "default:gravel",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 4,
 		y_max = 46,
 		y_min = 2,
@@ -988,9 +981,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 2,
 		node_riverbed = "default:gravel",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = 1,
 		y_min = -3,
@@ -1006,25 +996,9 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:gravel",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = -4,
-		y_min = -255,
-		heat_point = 0,
-		humidity_point = 40,
-	})
-
-	minetest.register_biome({
-		name = "tundra_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 0,
 		humidity_point = 40,
 	})
@@ -1040,9 +1014,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 4,
 		heat_point = 25,
@@ -1058,25 +1029,9 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = 3,
-		y_min = -255,
-		heat_point = 25,
-		humidity_point = 70,
-	})
-
-	minetest.register_biome({
-		name = "taiga_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 25,
 		humidity_point = 70,
 	})
@@ -1092,9 +1047,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 1,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 4,
 		heat_point = 20,
@@ -1110,25 +1062,9 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = 3,
-		y_min = -255,
-		heat_point = 20,
-		humidity_point = 35,
-	})
-
-	minetest.register_biome({
-		name = "snowy_grassland_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 20,
 		humidity_point = 35,
 	})
@@ -1143,9 +1079,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 1,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 6,
 		heat_point = 50,
@@ -1160,9 +1093,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 2,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = 5,
 		y_min = 4,
@@ -1178,24 +1108,8 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = 3,
-		y_min = -255,
-		heat_point = 50,
-		humidity_point = 35,
-	})
-
-	minetest.register_biome({
-		name = "grassland_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 50,
 		humidity_point = 35,
 	})
@@ -1210,9 +1124,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 6,
 		heat_point = 45,
@@ -1227,9 +1138,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = 5,
 		y_min = 4,
@@ -1245,24 +1153,8 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = 3,
-		y_min = -255,
-		heat_point = 45,
-		humidity_point = 70,
-	})
-
-	minetest.register_biome({
-		name = "coniferous_forest_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 45,
 		humidity_point = 70,
 	})
@@ -1277,9 +1169,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 1,
 		heat_point = 60,
@@ -1294,9 +1183,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = 0,
 		y_min = -1,
 		heat_point = 60,
@@ -1311,25 +1197,9 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = -2,
-		y_min = -255,
-		heat_point = 60,
-		humidity_point = 68,
-	})
-
-	minetest.register_biome({
-		name = "deciduous_forest_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 60,
 		humidity_point = 68,
 	})
@@ -1345,8 +1215,6 @@ function default.register_biomes(upper_limit)
 		node_stone = "default:desert_stone",
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:desert_stone",
-		node_dungeon_stair = "stairs:stair_desert_stone",
 		y_max = upper_limit,
 		y_min = 4,
 		heat_point = 92,
@@ -1362,24 +1230,9 @@ function default.register_biomes(upper_limit)
 		node_stone = "default:desert_stone",
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:desert_stone",
-		node_dungeon_stair = "stairs:stair_desert_stone",
 		vertical_blend = 1,
 		y_max = 3,
-		y_min = -255,
-		heat_point = 92,
-		humidity_point = 16,
-	})
-
-	minetest.register_biome({
-		name = "desert_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 92,
 		humidity_point = 16,
 	})
@@ -1395,8 +1248,6 @@ function default.register_biomes(upper_limit)
 		node_stone = "default:sandstone",
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:sandstonebrick",
-		node_dungeon_stair = "stairs:stair_sandstone_block",
 		y_max = upper_limit,
 		y_min = 4,
 		heat_point = 60,
@@ -1412,23 +1263,8 @@ function default.register_biomes(upper_limit)
 		node_stone = "default:sandstone",
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:sandstonebrick",
-		node_dungeon_stair = "stairs:stair_sandstone_block",
 		y_max = 3,
-		y_min = -255,
-		heat_point = 60,
-		humidity_point = 0,
-	})
-
-	minetest.register_biome({
-		name = "sandstone_desert_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 60,
 		humidity_point = 0,
 	})
@@ -1443,9 +1279,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 1,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 4,
 		heat_point = 40,
@@ -1460,25 +1293,9 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = 3,
-		y_min = -255,
-		heat_point = 40,
-		humidity_point = 0,
-	})
-
-	minetest.register_biome({
-		name = "cold_desert_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 40,
 		humidity_point = 0,
 	})
@@ -1487,15 +1304,12 @@ function default.register_biomes(upper_limit)
 
 	minetest.register_biome({
 		name = "savanna",
-		node_top = "default:dry_dirt_with_dry_grass",
+		node_top = "default:dirt_with_dry_grass",
 		depth_top = 1,
-		node_filler = "default:dry_dirt",
+		node_filler = "default:dirt",
 		depth_filler = 1,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 1,
 		heat_point = 89,
@@ -1504,15 +1318,12 @@ function default.register_biomes(upper_limit)
 
 	minetest.register_biome({
 		name = "savanna_shore",
-		node_top = "default:dry_dirt",
+		node_top = "default:dirt",
 		depth_top = 1,
-		node_filler = "default:dry_dirt",
+		node_filler = "default:dirt",
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = 0,
 		y_min = -1,
 		heat_point = 89,
@@ -1527,25 +1338,9 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = -2,
-		y_min = -255,
-		heat_point = 89,
-		humidity_point = 42,
-	})
-
-	minetest.register_biome({
-		name = "savanna_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
-		y_min = -31000,
+		y_min = -112,
 		heat_point = 89,
 		humidity_point = 42,
 	})
@@ -1560,9 +1355,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = upper_limit,
 		y_min = 1,
 		heat_point = 86,
@@ -1577,9 +1369,6 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = 0,
 		y_min = -1,
 		heat_point = 86,
@@ -1594,27 +1383,21 @@ function default.register_biomes(upper_limit)
 		depth_filler = 3,
 		node_riverbed = "default:sand",
 		depth_riverbed = 2,
-		node_cave_liquid = "default:water_source",
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		vertical_blend = 1,
 		y_max = -2,
-		y_min = -255,
+		y_min = -112,
 		heat_point = 86,
 		humidity_point = 65,
 	})
 
+	-- Underground
+
 	minetest.register_biome({
-		name = "rainforest_under",
-		node_cave_liquid = {"default:water_source", "default:lava_source"},
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
-		y_max = -256,
+		name = "underground",
+		y_max = -113,
 		y_min = -31000,
-		heat_point = 86,
-		humidity_point = 65,
+		heat_point = 50,
+		humidity_point = 50,
 	})
 end
 
@@ -1631,9 +1414,6 @@ function default.register_floatland_biomes(floatland_level, shadow_limit)
 		depth_top = 1,
 		node_filler = "default:dirt",
 		depth_filler = 1,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = 31000,
 		y_min = floatland_level + 2,
 		heat_point = 50,
@@ -1646,9 +1426,6 @@ function default.register_floatland_biomes(floatland_level, shadow_limit)
 		depth_top = 1,
 		node_filler = "default:dirt",
 		depth_filler = 3,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = 31000,
 		y_min = floatland_level + 2,
 		heat_point = 50,
@@ -1661,9 +1438,6 @@ function default.register_floatland_biomes(floatland_level, shadow_limit)
 		depth_top = 1,
 		node_filler = "default:sand",
 		depth_filler = 3,
-		node_dungeon = "default:cobble",
-		node_dungeon_alt = "default:mossycobble",
-		node_dungeon_stair = "stairs:stair_cobble",
 		y_max = floatland_level + 1,
 		y_min = shadow_limit,
 		heat_point = 50,
@@ -1798,7 +1572,7 @@ local function register_dry_grass_decoration(offset, scale, length)
 	minetest.register_decoration({
 		name = "default:dry_grass_" .. length,
 		deco_type = "simple",
-		place_on = {"default:dry_dirt_with_dry_grass"},
+		place_on = {"default:dirt_with_dry_grass"},
 		sidelen = 16,
 		noise_params = {
 			offset = offset,
@@ -1838,30 +1612,6 @@ end
 
 
 function default.register_decorations()
-	-- Savanna bare dirt patches.
-	-- Must come before all savanna decorations that are placed on dry grass.
-	-- Noise is similar to long dry grass noise, but scale inverted, to appear
-	-- where long dry grass is least dense and shortest.
-
-	minetest.register_decoration({
-		deco_type = "simple",
-		place_on = {"default:dry_dirt_with_dry_grass"},
-		sidelen = 4,
-		noise_params = {
-			offset = -1.5,
-			scale = -1.5,
-			spread = {x = 200, y = 200, z = 200},
-			seed = 329,
-			octaves = 4,
-			persist = 1.0
-		},
-		biomes = {"savanna"},
-		y_max = 31000,
-		y_min = 1,
-		decoration = "default:dry_dirt",
-		place_offset_y = -1,
-		flags = "force_placement",
-	})
 
 	-- Apple tree and log
 
@@ -2036,7 +1786,7 @@ function default.register_decorations()
 	minetest.register_decoration({
 		name = "default:acacia_tree",
 		deco_type = "schematic",
-		place_on = {"default:dry_dirt_with_dry_grass"},
+		place_on = {"default:dirt_with_dry_grass"},
 		sidelen = 16,
 		noise_params = {
 			offset = 0,
@@ -2057,7 +1807,7 @@ function default.register_decorations()
 	minetest.register_decoration({
 		name = "default:acacia_log",
 		deco_type = "schematic",
-		place_on = {"default:dry_dirt_with_dry_grass"},
+		place_on = {"default:dirt_with_dry_grass"},
 		place_offset_y = 1,
 		sidelen = 16,
 		noise_params = {
@@ -2074,7 +1824,7 @@ function default.register_decorations()
 		schematic = minetest.get_modpath("default") .. "/schematics/acacia_log.mts",
 		flags = "place_center_x",
 		rotation = "random",
-		spawn_by = "default:dry_dirt_with_dry_grass",
+		spawn_by = "default:dirt_with_dry_grass",
 		num_spawn_by = 8,
 	})
 
@@ -2242,7 +1992,7 @@ function default.register_decorations()
 	minetest.register_decoration({
 		name = "default:acacia_bush",
 		deco_type = "schematic",
-		place_on = {"default:dry_dirt_with_dry_grass"},
+		place_on = {"default:dirt_with_dry_grass"},
 		sidelen = 16,
 		noise_params = {
 			offset = -0.004,
diff --git a/mods/default/mod.conf b/mods/default/mod.conf
deleted file mode 100644
index c9e7468..0000000
--- a/mods/default/mod.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-name = default
-description = Minetest Game mod: default
-optional_depends = player_api
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index b29f679..aa8f361 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -52,8 +52,6 @@ default:dirt_with_dry_grass
 default:dirt_with_snow
 default:dirt_with_rainforest_litter
 default:dirt_with_coniferous_litter
-default:dry_dirt
-default:dry_dirt_with_dry_grass
 
 default:permafrost
 default:permafrost_with_stones
@@ -227,16 +225,6 @@ default:cloud
 
 --]]
 
--- Required wrapper to allow customization of default.after_place_leaves
-local function after_place_leaves(...)
-	return default.after_place_leaves(...)
-end
-
--- Required wrapper to allow customization of default.grow_sapling
-local function grow_sapling(...)
-	return default.grow_sapling(...)
-end
-
 --
 -- Stone
 --
@@ -245,7 +233,7 @@ minetest.register_node("default:stone", {
 	description = "Stone",
 	tiles = {"default_stone.png"},
 	groups = {cracky = 3, stone = 1},
-	drop = "default:cobble",
+	drop = 'default:cobble',
 	legacy_mineral = true,
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -289,7 +277,7 @@ minetest.register_node("default:desert_stone", {
 	description = "Desert Stone",
 	tiles = {"default_desert_stone.png"},
 	groups = {cracky = 3, stone = 1},
-	drop = "default:desert_cobble",
+	drop = 'default:desert_cobble',
 	legacy_mineral = true,
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -437,7 +425,7 @@ minetest.register_node("default:dirt_with_grass", {
 		{name = "default_dirt.png^default_grass_side.png",
 			tileable_vertical = false}},
 	groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
-	drop = "default:dirt",
+	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name = "default_grass_footstep", gain = 0.25},
 	}),
@@ -449,7 +437,7 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 		{name = "default_dirt.png^default_grass_side.png",
 			tileable_vertical = false}},
 	groups = {crumbly = 3, soil = 1, not_in_creative_inventory = 1},
-	drop = "default:dirt",
+	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name = "default_grass_footstep", gain = 0.25},
 	}),
@@ -461,8 +449,8 @@ minetest.register_node("default:dirt_with_dry_grass", {
 		"default_dirt.png",
 		{name = "default_dirt.png^default_dry_grass_side.png",
 			tileable_vertical = false}},
-	groups = {crumbly = 3, soil = 1},
-	drop = "default:dirt",
+	groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
+	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name = "default_grass_footstep", gain = 0.4},
 	}),
@@ -474,7 +462,7 @@ minetest.register_node("default:dirt_with_snow", {
 		{name = "default_dirt.png^default_snow_side.png",
 			tileable_vertical = false}},
 	groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1, snowy = 1},
-	drop = "default:dirt",
+	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name = "default_snow_footstep", gain = 0.2},
 	}),
@@ -510,25 +498,6 @@ minetest.register_node("default:dirt_with_coniferous_litter", {
 	}),
 })
 
-minetest.register_node("default:dry_dirt", {
-	description = "Dry Dirt",
-	tiles = {"default_dry_dirt.png"},
-	groups = {crumbly = 3, soil = 1},
-	sounds = default.node_sound_dirt_defaults(),
-})
-
-minetest.register_node("default:dry_dirt_with_dry_grass", {
-	description = "Dry Dirt with Dry Grass",
-	tiles = {"default_dry_grass.png", "default_dry_dirt.png",
-		{name = "default_dry_dirt.png^default_dry_grass_side.png",
-			tileable_vertical = false}},
-	groups = {crumbly = 3, soil = 1},
-	drop = "default:dry_dirt",
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name = "default_grass_footstep", gain = 0.4},
-	}),
-})
-
 minetest.register_node("default:permafrost", {
 	description = "Permafrost",
 	tiles = {"default_permafrost.png"},
@@ -586,8 +555,8 @@ minetest.register_node("default:gravel", {
 	drop = {
 		max_items = 1,
 		items = {
-			{items = {"default:flint"}, rarity = 16},
-			{items = {"default:gravel"}}
+			{items = {'default:flint'}, rarity = 16},
+			{items = {'default:gravel'}}
 		}
 	}
 })
@@ -596,7 +565,7 @@ minetest.register_node("default:clay", {
 	description = "Clay",
 	tiles = {"default_clay.png"},
 	groups = {crumbly = 3},
-	drop = "default:clay_lump 4",
+	drop = 'default:clay_lump 4',
 	sounds = default.node_sound_dirt_defaults(),
 })
 
@@ -702,7 +671,7 @@ minetest.register_node("default:sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -743,19 +712,19 @@ minetest.register_node("default:leaves", {
 		items = {
 			{
 				-- player will get sapling with 1/20 chance
-				items = {"default:sapling"},
+				items = {'default:sapling'},
 				rarity = 20,
 			},
 			{
 				-- player will get leaves only if he get no saplings,
 				-- this is because max_items is 1
-				items = {"default:leaves"},
+				items = {'default:leaves'},
 			}
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:apple", {
@@ -845,13 +814,13 @@ minetest.register_node("default:jungleleaves", {
 	drop = {
 		max_items = 1,
 		items = {
-			{items = {"default:junglesapling"}, rarity = 20},
-			{items = {"default:jungleleaves"}}
+			{items = {'default:junglesapling'}, rarity = 20},
+			{items = {'default:jungleleaves'}}
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:junglesapling", {
@@ -863,7 +832,7 @@ minetest.register_node("default:junglesapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -899,7 +868,7 @@ minetest.register_node("default:emergent_jungle_sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -965,7 +934,7 @@ minetest.register_node("default:pine_needles",{
 	},
 	sounds = default.node_sound_leaves_defaults(),
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:pine_sapling", {
@@ -977,7 +946,7 @@ minetest.register_node("default:pine_sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -1045,7 +1014,7 @@ minetest.register_node("default:acacia_leaves", {
 	},
 	sounds = default.node_sound_leaves_defaults(),
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:acacia_sapling", {
@@ -1057,7 +1026,7 @@ minetest.register_node("default:acacia_sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
@@ -1123,7 +1092,7 @@ minetest.register_node("default:aspen_leaves", {
 	},
 	sounds = default.node_sound_leaves_defaults(),
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:aspen_sapling", {
@@ -1135,7 +1104,7 @@ minetest.register_node("default:aspen_sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-3 / 16, -0.5, -3 / 16, 3 / 16, 0.5, 3 / 16}
@@ -1170,7 +1139,7 @@ minetest.register_node("default:stone_with_coal", {
 	description = "Coal Ore",
 	tiles = {"default_stone.png^default_mineral_coal.png"},
 	groups = {cracky = 3},
-	drop = "default:coal_lump",
+	drop = 'default:coal_lump',
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -1187,7 +1156,7 @@ minetest.register_node("default:stone_with_iron", {
 	description = "Iron Ore",
 	tiles = {"default_stone.png^default_mineral_iron.png"},
 	groups = {cracky = 2},
-	drop = "default:iron_lump",
+	drop = 'default:iron_lump',
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -1204,7 +1173,7 @@ minetest.register_node("default:stone_with_copper", {
 	description = "Copper Ore",
 	tiles = {"default_stone.png^default_mineral_copper.png"},
 	groups = {cracky = 2},
-	drop = "default:copper_lump",
+	drop = 'default:copper_lump',
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -1682,7 +1651,7 @@ minetest.register_node("default:bush_leaves", {
 	},
 	sounds = default.node_sound_leaves_defaults(),
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:bush_sapling", {
@@ -1694,7 +1663,7 @@ minetest.register_node("default:bush_sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 2 / 16, 4 / 16}
@@ -1761,7 +1730,7 @@ minetest.register_node("default:blueberry_bush_leaves", {
 		end
 	end,
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:blueberry_bush_sapling", {
@@ -1773,7 +1742,7 @@ minetest.register_node("default:blueberry_bush_sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 2 / 16, 4 / 16}
@@ -1832,7 +1801,7 @@ minetest.register_node("default:acacia_bush_leaves", {
 	},
 	sounds = default.node_sound_leaves_defaults(),
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:acacia_bush_sapling", {
@@ -1844,7 +1813,7 @@ minetest.register_node("default:acacia_bush_sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-3 / 16, -0.5, -3 / 16, 3 / 16, 2 / 16, 3 / 16}
@@ -1903,7 +1872,7 @@ minetest.register_node("default:pine_bush_needles", {
 	},
 	sounds = default.node_sound_leaves_defaults(),
 
-	after_place_node = after_place_leaves,
+	after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:pine_bush_sapling", {
@@ -1915,7 +1884,7 @@ minetest.register_node("default:pine_bush_sapling", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	on_timer = grow_sapling,
+	on_timer = default.grow_sapling,
 	selection_box = {
 		type = "fixed",
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 2 / 16, 4 / 16}
@@ -2017,46 +1986,6 @@ minetest.register_node("default:sand_with_kelp", {
 -- Corals
 --
 
-local function coral_on_place(itemstack, placer, pointed_thing)
-	if pointed_thing.type ~= "node" or not placer then
-		return itemstack
-	end
-
-	local player_name = placer:get_player_name()
-	local pos_under = pointed_thing.under
-	local pos_above = pointed_thing.above
-	local node_under = minetest.get_node(pos_under)
-	local def_under = minetest.registered_nodes[node_under.name]
-
-	if def_under and def_under.on_rightclick and not placer:get_player_control().sneak then
-		return def_under.on_rightclick(pos_under, node_under.name,
-				placer, itemstack, pointed_thing) or itemstack
-	end
-
-	if node_under.name ~= "default:coral_skeleton" or
-			minetest.get_node(pos_above).name ~= "default:water_source" then
-		return itemstack
-	end
-
-	if minetest.is_protected(pos_under, player_name) or
-			minetest.is_protected(pos_above, player_name) then
-		minetest.log("action", player_name
-			.. " tried to place " .. itemstack:get_name()
-			.. " at protected position "
-			.. minetest.pos_to_string(pos_under))
-		minetest.record_protection_violation(pos_under, player_name)
-		return itemstack
-	end
-
-	node_under.name = itemstack:get_name()
-	minetest.set_node(pos_under, node_under)
-	if not (creative and creative.is_enabled_for(player_name)) then
-		itemstack:take_item()
-	end
-
-	return itemstack
-end
-
 minetest.register_node("default:coral_green", {
 	description = "Green Coral",
 	drawtype = "plantlike_rooted",
@@ -2080,7 +2009,34 @@ minetest.register_node("default:coral_green", {
 		dug = {name = "default_grass_footstep", gain = 0.25},
 	}),
 
-	on_place = coral_on_place,
+	on_place = function(itemstack, placer, pointed_thing)
+		if pointed_thing.type ~= "node" or not placer then
+			return itemstack
+		end
+
+		local player_name = placer:get_player_name()
+		local pos_under = pointed_thing.under
+		local pos_above = pointed_thing.above
+
+		if minetest.get_node(pos_under).name ~= "default:coral_skeleton" or
+				minetest.get_node(pos_above).name ~= "default:water_source" then
+			return itemstack
+		end
+
+		if minetest.is_protected(pos_under, player_name) or
+				minetest.is_protected(pos_above, player_name) then
+			minetest.chat_send_player(player_name, "Node is protected")
+			minetest.record_protection_violation(pos_under, player_name)
+			return itemstack
+		end
+
+		minetest.set_node(pos_under, {name = "default:coral_green"})
+		if not (creative and creative.is_enabled_for(player_name)) then
+			itemstack:take_item()
+		end
+
+		return itemstack
+	end,
 
 	after_destruct  = function(pos, oldnode)
 		minetest.set_node(pos, {name = "default:coral_skeleton"})
@@ -2110,7 +2066,34 @@ minetest.register_node("default:coral_pink", {
 		dug = {name = "default_grass_footstep", gain = 0.25},
 	}),
 
-	on_place = coral_on_place,
+	on_place = function(itemstack, placer, pointed_thing)
+		if pointed_thing.type ~= "node" or not placer then
+			return itemstack
+		end
+
+		local player_name = placer:get_player_name()
+		local pos_under = pointed_thing.under
+		local pos_above = pointed_thing.above
+
+		if minetest.get_node(pos_under).name ~= "default:coral_skeleton" or
+				minetest.get_node(pos_above).name ~= "default:water_source" then
+			return itemstack
+		end
+
+		if minetest.is_protected(pos_under, player_name) or
+				minetest.is_protected(pos_above, player_name) then
+			minetest.chat_send_player(player_name, "Node is protected")
+			minetest.record_protection_violation(pos_under, player_name)
+			return itemstack
+		end
+
+		minetest.set_node(pos_under, {name = "default:coral_pink"})
+		if not (creative and creative.is_enabled_for(player_name)) then
+			itemstack:take_item()
+		end
+
+		return itemstack
+	end,
 
 	after_destruct  = function(pos, oldnode)
 		minetest.set_node(pos, {name = "default:coral_skeleton"})
@@ -2140,7 +2123,34 @@ minetest.register_node("default:coral_cyan", {
 		dug = {name = "default_grass_footstep", gain = 0.25},
 	}),
 
-	on_place = coral_on_place,
+	on_place = function(itemstack, placer, pointed_thing)
+		if pointed_thing.type ~= "node" or not placer then
+			return itemstack
+		end
+
+		local player_name = placer:get_player_name()
+		local pos_under = pointed_thing.under
+		local pos_above = pointed_thing.above
+
+		if minetest.get_node(pos_under).name ~= "default:coral_skeleton" or
+				minetest.get_node(pos_above).name ~= "default:water_source" then
+			return itemstack
+		end
+
+		if minetest.is_protected(pos_under, player_name) or
+				minetest.is_protected(pos_above, player_name) then
+			minetest.chat_send_player(player_name, "Node is protected")
+			minetest.record_protection_violation(pos_under, player_name)
+			return itemstack
+		end
+
+		minetest.set_node(pos_under, {name = "default:coral_cyan"})
+		if not (creative and creative.is_enabled_for(player_name)) then
+			itemstack:take_item()
+		end
+
+		return itemstack
+	end,
 
 	after_destruct  = function(pos, oldnode)
 		minetest.set_node(pos, {name = "default:coral_skeleton"})
@@ -2178,7 +2188,6 @@ minetest.register_node("default:coral_skeleton", {
 minetest.register_node("default:water_source", {
 	description = "Water Source",
 	drawtype = "liquid",
-	waving = 3,
 	tiles = {
 		{
 			name = "default_water_source_animated.png",
@@ -2222,7 +2231,6 @@ minetest.register_node("default:water_source", {
 minetest.register_node("default:water_flowing", {
 	description = "Flowing Water",
 	drawtype = "flowingliquid",
-	waving = 3,
 	tiles = {"default_water.png"},
 	special_tiles = {
 		{
diff --git a/mods/default/schematics/large_cactus.mts b/mods/default/schematics/large_cactus.mts
index cadcdcc..e453573 100644
Binary files a/mods/default/schematics/large_cactus.mts and b/mods/default/schematics/large_cactus.mts differ
diff --git a/mods/default/textures/default_dry_dirt.png b/mods/default/textures/default_dry_dirt.png
deleted file mode 100644
index 8ee5398..0000000
Binary files a/mods/default/textures/default_dry_dirt.png and /dev/null differ
diff --git a/mods/default/textures/default_grass.png b/mods/default/textures/default_grass.png
index 5778caa..0181fab 100644
Binary files a/mods/default/textures/default_grass.png and b/mods/default/textures/default_grass.png differ
diff --git a/mods/default/textures/default_grass_side.png b/mods/default/textures/default_grass_side.png
index 079d96a..bfd538d 100644
Binary files a/mods/default/textures/default_grass_side.png and b/mods/default/textures/default_grass_side.png differ
diff --git a/mods/default/textures/default_permafrost.png b/mods/default/textures/default_permafrost.png
index 6f2567e..d7a19a2 100644
Binary files a/mods/default/textures/default_permafrost.png and b/mods/default/textures/default_permafrost.png differ
diff --git a/mods/default/tools.lua b/mods/default/tools.lua
index f798115..9f503ed 100644
--- a/mods/default/tools.lua
+++ b/mods/default/tools.lua
@@ -32,8 +32,8 @@ minetest.register_tool("default:pick_wood", {
 		},
 		damage_groups = {fleshy=2},
 	},
+	groups = {flammable = 2},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {pickaxe = 1, flammable = 2}
 })
 
 minetest.register_tool("default:pick_stone", {
@@ -48,7 +48,6 @@ minetest.register_tool("default:pick_stone", {
 		damage_groups = {fleshy=3},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {pickaxe = 1}
 })
 
 minetest.register_tool("default:pick_bronze", {
@@ -63,7 +62,6 @@ minetest.register_tool("default:pick_bronze", {
 		damage_groups = {fleshy=4},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {pickaxe = 1}
 })
 
 minetest.register_tool("default:pick_steel", {
@@ -78,7 +76,6 @@ minetest.register_tool("default:pick_steel", {
 		damage_groups = {fleshy=4},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {pickaxe = 1}
 })
 
 minetest.register_tool("default:pick_mese", {
@@ -93,7 +90,6 @@ minetest.register_tool("default:pick_mese", {
 		damage_groups = {fleshy=5},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {pickaxe = 1}
 })
 
 minetest.register_tool("default:pick_diamond", {
@@ -108,7 +104,6 @@ minetest.register_tool("default:pick_diamond", {
 		damage_groups = {fleshy=5},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {pickaxe = 1}
 })
 
 --
@@ -127,8 +122,8 @@ minetest.register_tool("default:shovel_wood", {
 		},
 		damage_groups = {fleshy=2},
 	},
+	groups = {flammable = 2},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {shovel = 1, flammable = 2}
 })
 
 minetest.register_tool("default:shovel_stone", {
@@ -144,7 +139,6 @@ minetest.register_tool("default:shovel_stone", {
 		damage_groups = {fleshy=2},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {shovel = 1}
 })
 
 minetest.register_tool("default:shovel_bronze", {
@@ -160,7 +154,6 @@ minetest.register_tool("default:shovel_bronze", {
 		damage_groups = {fleshy=3},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {shovel = 1}
 })
 
 minetest.register_tool("default:shovel_steel", {
@@ -176,7 +169,6 @@ minetest.register_tool("default:shovel_steel", {
 		damage_groups = {fleshy=3},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {shovel = 1}
 })
 
 minetest.register_tool("default:shovel_mese", {
@@ -192,7 +184,6 @@ minetest.register_tool("default:shovel_mese", {
 		damage_groups = {fleshy=4},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {shovel = 1}
 })
 
 minetest.register_tool("default:shovel_diamond", {
@@ -208,7 +199,6 @@ minetest.register_tool("default:shovel_diamond", {
 		damage_groups = {fleshy=4},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {shovel = 1}
 })
 
 --
@@ -226,8 +216,8 @@ minetest.register_tool("default:axe_wood", {
 		},
 		damage_groups = {fleshy=2},
 	},
+	groups = {flammable = 2},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {axe = 1, flammable = 2}
 })
 
 minetest.register_tool("default:axe_stone", {
@@ -242,7 +232,6 @@ minetest.register_tool("default:axe_stone", {
 		damage_groups = {fleshy=3},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {axe = 1}
 })
 
 minetest.register_tool("default:axe_bronze", {
@@ -257,7 +246,6 @@ minetest.register_tool("default:axe_bronze", {
 		damage_groups = {fleshy=4},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {axe = 1}
 })
 
 minetest.register_tool("default:axe_steel", {
@@ -272,7 +260,6 @@ minetest.register_tool("default:axe_steel", {
 		damage_groups = {fleshy=4},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {axe = 1}
 })
 
 minetest.register_tool("default:axe_mese", {
@@ -287,7 +274,6 @@ minetest.register_tool("default:axe_mese", {
 		damage_groups = {fleshy=6},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {axe = 1}
 })
 
 minetest.register_tool("default:axe_diamond", {
@@ -302,7 +288,6 @@ minetest.register_tool("default:axe_diamond", {
 		damage_groups = {fleshy=7},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {axe = 1}
 })
 
 --
@@ -320,8 +305,8 @@ minetest.register_tool("default:sword_wood", {
 		},
 		damage_groups = {fleshy=2},
 	},
+	groups = {flammable = 2},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {sword = 1, flammable = 2}
 })
 
 minetest.register_tool("default:sword_stone", {
@@ -336,7 +321,6 @@ minetest.register_tool("default:sword_stone", {
 		damage_groups = {fleshy=4},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {sword = 1}
 })
 
 minetest.register_tool("default:sword_bronze", {
@@ -351,7 +335,6 @@ minetest.register_tool("default:sword_bronze", {
 		damage_groups = {fleshy=6},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {sword = 1}
 })
 
 minetest.register_tool("default:sword_steel", {
@@ -366,7 +349,6 @@ minetest.register_tool("default:sword_steel", {
 		damage_groups = {fleshy=6},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {sword = 1}
 })
 
 minetest.register_tool("default:sword_mese", {
@@ -381,7 +363,6 @@ minetest.register_tool("default:sword_mese", {
 		damage_groups = {fleshy=7},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {sword = 1}
 })
 
 minetest.register_tool("default:sword_diamond", {
@@ -396,7 +377,6 @@ minetest.register_tool("default:sword_diamond", {
 		damage_groups = {fleshy=8},
 	},
 	sound = {breaks = "default_tool_breaks"},
-	groups = {sword = 1}
 })
 
 minetest.register_tool("default:key", {