diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua
index 2cf6ad8e3..8a1b81341 100644
--- a/mods/ITEMS/mcl_core/functions.lua
+++ b/mods/ITEMS/mcl_core/functions.lua
@@ -2,6 +2,8 @@
 -- Lava vs water interactions
 --
 
+local mg_name = minetest.get_mapgen_setting("mg_name")
+
 minetest.register_abm({
 	label = "Lava cooling",
 	nodenames = {"group:lava"},
@@ -247,8 +249,10 @@ function mcl_core.generate_tree(pos, tree_type, two_by_two)
 	end
 end
 
--- For oak and birch
-local function generate_oaklike_tree(pos, trunk, leaves)
+-- Classic oak in v6 style
+local function generate_v6_oak(pos)
+	local trunk = "mcl_core:tree"
+	local leaves = "mcl_core:leaves"
 	node = {name = ""}
 	for dy=1,4 do
 		pos.y = pos.y+dy
@@ -310,12 +314,22 @@ local function generate_oaklike_tree(pos, trunk, leaves)
 	end
 end
 
+-- Oak
 function mcl_core.generate_oak_tree(pos)
-	generate_oaklike_tree(pos, "mcl_core:tree", "mcl_core:leaves")
+	if mg_name == "v6" then
+		generate_v6_oak_tree(pos)
+	else
+		local path = minetest.get_modpath("mcl_core") ..
+			"/schematics/mcl_core_oak_classic.mts"
+		minetest.place_schematic({x = pos.x - 2, y = pos.y - 1 , z = pos.z - 2}, path, "random", nil, false)
+	end
 end
 
+-- Birch
 function mcl_core.generate_birch_tree(pos)
-	generate_oaklike_tree(pos, "mcl_core:birchtree", "mcl_core:birchleaves")
+	local path = minetest.get_modpath("mcl_core") ..
+		"/schematics/mcl_core_birch.mts"
+	minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2}, path, "random", nil, false)
 end
 
 -- BEGIN of spruce tree generation functions --
diff --git a/mods/ITEMS/mcl_core/schematics/aspen_tree.mts b/mods/ITEMS/mcl_core/schematics/aspen_tree.mts
deleted file mode 100644
index 429a831c7..000000000
Binary files a/mods/ITEMS/mcl_core/schematics/aspen_tree.mts and /dev/null differ
diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_birch.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_birch.mts
new file mode 100644
index 000000000..fae91424f
Binary files /dev/null and b/mods/ITEMS/mcl_core/schematics/mcl_core_birch.mts differ
diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_birch_tall.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_birch_tall.mts
new file mode 100644
index 000000000..f24adf9a0
Binary files /dev/null and b/mods/ITEMS/mcl_core/schematics/mcl_core_birch_tall.mts differ
diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_oak_classic.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_oak_classic.mts
index 39ce2c02d..7fe57a920 100644
Binary files a/mods/ITEMS/mcl_core/schematics/mcl_core_oak_classic.mts and b/mods/ITEMS/mcl_core/schematics/mcl_core_oak_classic.mts differ
diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index b22ff7082..f4546b5fb 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -28,9 +28,10 @@ local function register_biomes()
 	-- Icesheet
 	minetest.register_biome({
 		name = "icesheet",
-		node_top = "mcl_core:gravel",
+		node_dust = "mcl_core:snowblock",
+		node_top = "mcl_core:snowblock",
 		depth_top = 2,
-		node_filler = "mcl_core:dirt",
+		node_filler = "mcl_core:snowblock",
 		depth_filler = 3,
 		node_stone = "mcl_core:packed_ice",
 		node_water_top = "mcl_core:ice",
@@ -38,7 +39,7 @@ local function register_biomes()
 		node_river_water = "mcl_core:ice",
 		node_riverbed = "mcl_core:gravel",
 		depth_riverbed = 2,
-		y_min = 0,
+		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
 		heat_point = 0,
 		humidity_point = 73,
@@ -56,7 +57,7 @@ local function register_biomes()
 		node_riverbed = "mcl_core:gravel",
 		depth_riverbed = 2,
 		y_min = mcl_vars.mg_overworld_min,
-		y_max = -1,
+		y_max = 0,
 		heat_point = 0,
 		humidity_point = 73,
 	})
@@ -1033,7 +1034,7 @@ local function register_decorations()
 		biomes = {"deciduous_forest"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
-		schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_oak_v6.mts",
+		schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_oak_classic.mts",
 		flags = "place_center_x, place_center_z",
 		rotation = "random",
 	})
@@ -1266,7 +1267,7 @@ local function register_decorations()
 		biomes = {"deciduous_forest"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
-		schematic = minetest.get_modpath("mcl_core").."/schematics/aspen_tree.mts",
+		schematic = minetest.get_modpath("mcl_core").."/schematics/mcl_core_birch.mts",
 		flags = "place_center_x, place_center_z",
 	})
 
diff --git a/mods/MISC/mcl_temp_schematic_aliases/init.lua b/mods/MISC/mcl_temp_schematic_aliases/init.lua
index 6f37594a1..910c25aa3 100644
--- a/mods/MISC/mcl_temp_schematic_aliases/init.lua
+++ b/mods/MISC/mcl_temp_schematic_aliases/init.lua
@@ -3,9 +3,7 @@
 -- TODO: Update the offending schematics and delete this mod.
 
 minetest.register_alias("default:jungletree", "mcl_core:jungletree")
-minetest.register_alias("default:aspen_tree", "mcl_core:birchtree")
 minetest.register_alias("default:pine_tree", "mcl_core:sprucetree")
 
 minetest.register_alias("default:jungleleaves", "mcl_core:jungleleaves")
-minetest.register_alias("default:aspen_leaves", "mcl_core:birchleaves")
 minetest.register_alias("default:pine_needles", "mcl_core:spruceleaves")