diff --git a/mods/CORE/mcl_init/init.lua b/mods/CORE/mcl_init/init.lua
index a099f2136..af1105ce4 100644
--- a/mods/CORE/mcl_init/init.lua
+++ b/mods/CORE/mcl_init/init.lua
@@ -28,7 +28,7 @@ mcl_vars.tool_wield_scale = vector.new(1.8, 1.8, 1)
 
 -- Mapgen variables
 local mg_name = minetest.get_mapgen_setting("mg_name")
-local minecraft_height_limit = 256
+local minecraft_height_limit = 320
 local superflat = mg_name == "flat" and minetest.get_mapgen_setting("mcl_superflat_classic") == "true"
 local singlenode = mg_name == "singlenode"
 
@@ -117,7 +117,7 @@ if not superflat and not singlenode then
 	]]
 
 	-- Overworld
-	mcl_vars.mg_overworld_min = -62
+	mcl_vars.mg_overworld_min = -64
 	mcl_vars.mg_overworld_max_official = mcl_vars.mg_overworld_min + minecraft_height_limit
 	mcl_vars.mg_bedrock_overworld_min = mcl_vars.mg_overworld_min
 	mcl_vars.mg_bedrock_overworld_max = mcl_vars.mg_bedrock_overworld_min + 4
diff --git a/mods/ITEMS/mcl_amethyst/init.lua b/mods/ITEMS/mcl_amethyst/init.lua
index 4e9c8d2b1..c135b08fd 100644
--- a/mods/ITEMS/mcl_amethyst/init.lua
+++ b/mods/ITEMS/mcl_amethyst/init.lua
@@ -31,17 +31,6 @@ minetest.register_node("mcl_amethyst:budding_amethyst_block",{
 	_mcl_blast_resistance = 1.5,
 })
 
--- Calcite
-minetest.register_node("mcl_amethyst:calcite",{
-	description = S("Calcite"),
-	tiles = {"mcl_amethyst_calcite_block.png"},
-	groups = {pickaxey = 1, building_block = 1},
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	is_ground_content = true,
-	_mcl_hardness = 0.75,
-	_mcl_blast_resistance = 0.75,
-})
-
 -- Amethyst Cluster
 local bud_def = {
 	{
diff --git a/mods/ITEMS/mcl_deepslate/init.lua b/mods/ITEMS/mcl_deepslate/init.lua
index 2abe9d91f..4a87c0ed6 100644
--- a/mods/ITEMS/mcl_deepslate/init.lua
+++ b/mods/ITEMS/mcl_deepslate/init.lua
@@ -11,23 +11,6 @@ local function spawn_silverfish(pos, oldnode, oldmetadata, digger)
 	end
 end
 
-minetest.register_node("mcl_deepslate:deepslate", {
-	description = S("Deepslate"),
-	_doc_items_longdesc = S("Deepslate is a stone type found deep underground in the Overworld that functions similar to regular stone but is harder than the stone."),
-	_doc_items_hidden = false,
-	tiles = { "mcl_deepslate_top.png", "mcl_deepslate_top.png", "mcl_deepslate.png" },
-	paramtype2 = "facedir",
-	is_ground_content = true,
-	on_place = mcl_util.rotate_axis,
-	groups = { pickaxey = 1, stone = 1, building_block = 1, material_stone = 1 },
-	drop = cobble,
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	on_rotate = screwdriver.rotate_3way,
-	_mcl_blast_resistance = 6,
-	_mcl_hardness = 3,
-	_mcl_silk_touch_drop = true,
-})
-
 minetest.register_node("mcl_deepslate:infested_deepslate", {
 	description = S("Infested Deepslate"),
 	_doc_items_longdesc = S("An infested block is a block from which a silverfish will pop out when it is broken. It looks identical to its normal counterpart."),
diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua
index ed1ed5094..230a12fea 100644
--- a/mods/ITEMS/mcl_nether/init.lua
+++ b/mods/ITEMS/mcl_nether/init.lua
@@ -91,22 +91,6 @@ local function eternal_on_ignite(player, pointed_thing)
 	end
 end
 
-minetest.register_node("mcl_nether:netherrack", {
-	description = S("Netherrack"),
-	_doc_items_longdesc = S("Netherrack is a stone-like block home to the Nether. Starting a fire on this block will create an eternal fire."),
-	stack_max = 64,
-	tiles = {"mcl_nether_netherrack.png"},
-	is_ground_content = true,
-	groups = {pickaxey=1, building_block=1, material_stone=1, enderman_takable=1},
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 0.4,
-	_mcl_hardness = 0.4,
-
-	-- Eternal fire on top
-	after_destruct = eternal_after_destruct,
-	_on_ignite = eternal_on_ignite,
-})
-
 minetest.register_node("mcl_nether:magma", {
 	description = S("Magma Block"),
 	_tt_help = minetest.colorize(mcl_colors.YELLOW, S("Burns your feet")),
diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index 3d116dc30..723f3b943 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -2196,7 +2196,7 @@ local function register_dimension_biomes()
 		y_max = mcl_vars.mg_nether_max + 15,
 		height = 6,
 		max_height = 10,
-		decoration = "mcl_nether:netherrack",
+		decoration = "blocks:netherrack",
 		flags = "all_ceilings",
 		param2 = 0,
 	})
@@ -2209,16 +2209,16 @@ local function register_dimension_biomes()
 		y_max = mcl_vars.mg_lava_nether_max,
 		height = 7,
 		max_height = 14,
-		decoration = "mcl_nether:netherrack",
+		decoration = "blocks:netherrack",
 		flags = "all_floors,force_placement",
 		param2 = 0,
 	})
 
 	minetest.register_biome({
 		name = "Nether",
-		node_filler = "mcl_nether:netherrack",
-		node_stone = "mcl_nether:netherrack",
-		node_top = "mcl_nether:netherrack",
+		node_filler = "blocks:netherrack",
+		node_stone = "blocks:netherrack",
+		node_top = "blocks:netherrack",
 		node_water = "air",
 		node_river_water = "air",
 		node_cave_liquid = "air",
@@ -2238,21 +2238,21 @@ local function register_dimension_biomes()
 
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_nether:netherrack", "mcl_nether:glowstone", "mcl_blackstone:nether_gold", "mcl_nether:quartz_ore", "mcl_core:gravel", "mcl_nether:soul_sand", "mcl_nether:glowstone", "mcl_nether:magma"},
+		place_on = {"blocks:netherrack", "mcl_nether:glowstone", "mcl_blackstone:nether_gold", "mcl_nether:quartz_ore", "mcl_core:gravel", "mcl_nether:soul_sand", "mcl_nether:glowstone", "mcl_nether:magma"},
 		sidelen = 16,
 		fill_ratio = 10,
 		biomes = {"Nether"},
 		y_min = mcl_vars.mg_lava_nether_max,
 		y_max = mcl_vars.mg_nether_deco_max,
-		decoration = "mcl_nether:netherrack",
+		decoration = "blocks:netherrack",
 		flags = "all_floors",
 		param2 = 0,
 	})
 
 	minetest.register_biome({
 		name = "SoulsandValley",
-		node_filler = "mcl_nether:netherrack",
-		node_stone = "mcl_nether:netherrack",
+		node_filler = "blocks:netherrack",
+		node_stone = "blocks:netherrack",
 		node_top = "mcl_blackstone:soul_soil",
 		node_water = "air",
 		node_river_water = "air",
@@ -2271,7 +2271,7 @@ local function register_dimension_biomes()
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_nether:netherrack", "mcl_nether:glowstone", "mcl_nether:magma"},
+		place_on = {"blocks:netherrack", "mcl_nether:glowstone", "mcl_nether:magma"},
 		sidelen = 16,
 		fill_ratio = 10,
 		biomes = {"SoulsandValley"},
@@ -2285,7 +2285,7 @@ local function register_dimension_biomes()
 	minetest.register_ore({
 		ore_type = "blob",
 		ore = "mcl_nether:soul_sand",
-		wherein = {"mcl_nether:netherrack", "mcl_blackstone:soul_soil"},
+		wherein = {"blocks:netherrack", "mcl_blackstone:soul_soil"},
 		clust_scarcity = 100,
 		clust_num_ores = 225,
 		clust_size = 15,
@@ -2305,8 +2305,8 @@ local function register_dimension_biomes()
 	})
 	minetest.register_biome({
 		name = "CrimsonForest",
-		node_filler = "mcl_nether:netherrack",
-		node_stone = "mcl_nether:netherrack",
+		node_filler = "blocks:netherrack",
+		node_stone = "blocks:netherrack",
 		node_top = "mcl_crimson:crimson_nylium",
 		node_water = "air",
 		node_river_water = "air",
@@ -2325,7 +2325,7 @@ local function register_dimension_biomes()
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_nether:netherrack", "mcl_nether:glowstone", "mcl_blackstone:nether_gold", "mcl_nether:quartz_ore", "mcl_core:gravel", "mcl_nether:soul_sand", "mcl_nether:magma", "mcl_blackstone:blackstone"},
+		place_on = {"blocks:netherrack", "mcl_nether:glowstone", "mcl_blackstone:nether_gold", "mcl_nether:quartz_ore", "mcl_core:gravel", "mcl_nether:soul_sand", "mcl_nether:magma", "mcl_blackstone:blackstone"},
 		sidelen = 16,
 		fill_ratio = 10,
 		biomes = {"CrimsonForest"},
@@ -2337,8 +2337,8 @@ local function register_dimension_biomes()
 	})
 	minetest.register_biome({
 		name = "WarpedForest",
-		node_filler = "mcl_nether:netherrack",
-		node_stone = "mcl_nether:netherrack",
+		node_filler = "blocks:netherrack",
+		node_stone = "blocks:netherrack",
 		node_top = "mcl_crimson:warped_nylium",
 		node_water = "air",
 		node_river_water = "air",
@@ -2357,7 +2357,7 @@ local function register_dimension_biomes()
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_nether:netherrack", "mcl_nether:glowstone", "mcl_blackstone:nether_gold", "mcl_nether:quartz_ore", "mcl_core:gravel", "mcl_nether:soul_sand", "mcl_nether:magma", "mcl_blackstone:blackstone"},
+		place_on = {"blocks:netherrack", "mcl_nether:glowstone", "mcl_blackstone:nether_gold", "mcl_nether:quartz_ore", "mcl_core:gravel", "mcl_nether:soul_sand", "mcl_nether:magma", "mcl_blackstone:blackstone"},
 		sidelen = 16,
 		fill_ratio = 10,
 		biomes = {"WarpedForest"},
@@ -2369,8 +2369,8 @@ local function register_dimension_biomes()
 	})
 	minetest.register_biome({
 		name = "BasaltDelta",
-		node_filler = "mcl_nether:netherrack",
-		node_stone = "mcl_nether:netherrack",
+		node_filler = "blocks:netherrack",
+		node_stone = "blocks:netherrack",
 		node_top = "mcl_blackstone:basalt",
 		node_water = "air",
 		node_river_water = "air",
@@ -2390,7 +2390,7 @@ local function register_dimension_biomes()
 
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_nether:netherrack", "mcl_nether:glowstone", "mcl_blackstone:nether_gold", "mcl_nether:quartz_ore", "mcl_core:gravel", "mcl_nether:soul_sand", "mcl_blackstone:blackstone", "mcl_nether:magma"},
+		place_on = {"blocks:netherrack", "mcl_nether:glowstone", "mcl_blackstone:nether_gold", "mcl_nether:quartz_ore", "mcl_core:gravel", "mcl_nether:soul_sand", "mcl_blackstone:blackstone", "mcl_nether:magma"},
 		sidelen = 16,
 		fill_ratio = 10,
 		biomes = {"BasaltDelta"},
@@ -2404,7 +2404,7 @@ local function register_dimension_biomes()
 	minetest.register_ore({
 		ore_type = "blob",
 		ore = "mcl_blackstone:blackstone",
-		wherein = {"mcl_nether:netherrack", "mcl_nether:glowstone", "mcl_core:gravel"},
+		wherein = {"blocks:netherrack", "mcl_nether:glowstone", "mcl_core:gravel"},
 		clust_scarcity = 100,
 		clust_num_ores = 400,
 		clust_size = 20,
@@ -2648,7 +2648,7 @@ local function register_biome_ores()
 		minetest.register_ore({
 			ore_type = "scatter",
 			ore = "mcl_blackstone:nether_gold",
-			wherein = "mcl_nether:netherrack",
+			wherein = "blocks:netherrack",
 			clust_scarcity = 830,
 			clust_num_ores = 5,
 			clust_size = 3,
@@ -2658,7 +2658,7 @@ local function register_biome_ores()
 		minetest.register_ore({
 			ore_type = "scatter",
 			ore = "mcl_blackstone:nether_gold",
-			wherein = "mcl_nether:netherrack",
+			wherein = "blocks:netherrack",
 			clust_scarcity = 1660,
 			clust_num_ores = 4,
 			clust_size = 2,
@@ -3033,7 +3033,7 @@ local function register_dimension_ores()
 		ore = "mcl_nether:soul_sand",
 		-- Note: Stone is included only for v6 mapgen support. Netherrack is not generated naturally
 		-- in v6, but instead set with the on_generated function in mcl_mapgen_core.
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		clust_scarcity = 13 * 13 * 13,
 		clust_size = 5,
 		y_min = mcl_vars.mg_nether_min,
@@ -3053,7 +3053,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "blob",
 		ore = "mcl_nether:magma",
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		clust_scarcity = 8 * 8 * 8,
 		clust_num_ores = 45,
 		clust_size = 6,
@@ -3073,7 +3073,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "blob",
 		ore = "mcl_nether:magma",
-		wherein = {"mcl_nether:netherrack"},
+		wherein = {"blocks:netherrack"},
 		clust_scarcity = 10 * 10 * 10,
 		clust_num_ores = 65,
 		clust_size = 8,
@@ -3095,7 +3095,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "blob",
 		ore = "mcl_nether:glowstone",
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		clust_scarcity = 26 * 26 * 26,
 		clust_size = 5,
 		y_min = mcl_vars.mg_lava_nether_max + 10,
@@ -3115,7 +3115,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "sheet",
 		ore = "mcl_core:gravel",
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		column_height_min = 1,
 		column_height_max = 1,
 		column_midpoint_factor = 0,
@@ -3138,7 +3138,7 @@ local function register_dimension_ores()
 		minetest.register_ore({
 			ore_type = "scatter",
 			ore = "mcl_nether:quartz_ore",
-			wherein = {"mcl_nether:netherrack", "blocks:stone"},
+			wherein = {"blocks:netherrack", "blocks:stone"},
 			clust_scarcity = 850,
 			clust_num_ores = 4, -- MC cluster amount: 4-10
 			clust_size = 3,
@@ -3148,7 +3148,7 @@ local function register_dimension_ores()
 		minetest.register_ore({
 			ore_type = "scatter",
 			ore = "mcl_nether:quartz_ore",
-			wherein = {"mcl_nether:netherrack", "blocks:stone"},
+			wherein = {"blocks:netherrack", "blocks:stone"},
 			clust_scarcity = 1650,
 			clust_num_ores = 8, -- MC cluster amount: 4-10
 			clust_size = 4,
@@ -3161,7 +3161,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "scatter",
 		ore = "mcl_nether:nether_lava_source",
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		clust_scarcity = 13500, --rare
 		clust_num_ores = 1,
 		clust_size = 1,
@@ -3173,7 +3173,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "scatter",
 		ore = "mcl_nether:nether_lava_source",
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		clust_scarcity = 500,
 		clust_num_ores = 1,
 		clust_size = 1,
@@ -3185,7 +3185,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "scatter",
 		ore = "mcl_nether:nether_lava_source",
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		clust_scarcity = 1000,
 		clust_num_ores = 1,
 		clust_size = 1,
@@ -3197,7 +3197,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "scatter",
 		ore = "mcl_nether:nether_lava_source",
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		clust_scarcity = 2000,
 		clust_num_ores = 1,
 		clust_size = 1,
@@ -3208,7 +3208,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "scatter",
 		ore = "mcl_nether:nether_lava_source",
-		wherein = {"mcl_nether:netherrack", "blocks:stone"},
+		wherein = {"blocks:netherrack", "blocks:stone"},
 		clust_scarcity = 3500,
 		clust_num_ores = 1,
 		clust_size = 1,
@@ -5663,7 +5663,7 @@ local function register_dimension_decorations()
 	--NETHER WASTES (Nether)
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_nether:netherrack", "mcl_nether:magma"},
+		place_on = {"blocks:netherrack", "mcl_nether:magma"},
 		sidelen = 16,
 		fill_ratio = 0.04,
 		biomes = {"Nether"},
@@ -5674,7 +5674,7 @@ local function register_dimension_decorations()
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_nether:netherrack"},
+		place_on = {"blocks:netherrack"},
 		sidelen = 16,
 		fill_ratio = 0.013,
 		biomes = {"Nether"},
@@ -5685,7 +5685,7 @@ local function register_dimension_decorations()
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_nether:netherrack"},
+		place_on = {"blocks:netherrack"},
 		sidelen = 16,
 		fill_ratio = 0.012,
 		biomes = {"Nether"},
@@ -5838,7 +5838,7 @@ local function register_dimension_decorations()
 	})
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"mcl_crimson:warped_nylium", "mcl_crimson:weeping_vines", "mcl_nether:netherrack"},
+		place_on = {"mcl_crimson:warped_nylium", "mcl_crimson:weeping_vines", "blocks:netherrack"},
 		sidelen = 16,
 		fill_ratio = 0.063,
 		biomes = {"CrimsonForest"},
@@ -5925,7 +5925,7 @@ local function register_dimension_decorations()
 	minetest.register_decoration({
 		deco_type = "simple",
 		decoration = "mcl_blackstone:basalt",
-		place_on = {"mcl_blackstone:basalt", "mcl_nether:netherrack", "mcl_blackstone:blackstone"},
+		place_on = {"mcl_blackstone:basalt", "blocks:netherrack", "mcl_blackstone:blackstone"},
 		sidelen = 80,
 		height_max = 55,
 		noise_params = {
@@ -5946,7 +5946,7 @@ local function register_dimension_decorations()
 	minetest.register_decoration({
 		deco_type = "simple",
 		decoration = "mcl_blackstone:basalt",
-		place_on = {"mcl_blackstone:basalt", "mcl_nether:netherrack", "mcl_blackstone:blackstone"},
+		place_on = {"mcl_blackstone:basalt", "blocks:netherrack", "mcl_blackstone:blackstone"},
 		sidelen = 80,
 		height_max = 15,
 		noise_params = {
@@ -5967,7 +5967,7 @@ local function register_dimension_decorations()
 	minetest.register_decoration({
 		deco_type = "simple",
 		decoration = "mcl_blackstone:basalt",
-		place_on = {"mcl_blackstone:basalt", "mcl_nether:netherrack", "mcl_blackstone:blackstone"},
+		place_on = {"mcl_blackstone:basalt", "blocks:netherrack", "mcl_blackstone:blackstone"},
 		sidelen = 80,
 		height_max = 3,
 		fill_ratio = 0.4,
@@ -5979,7 +5979,7 @@ local function register_dimension_decorations()
 	minetest.register_decoration({
 		deco_type = "simple",
 		decoration = "mcl_nether:magma",
-		place_on = {"mcl_blackstone:basalt", "mcl_nether:netherrack", "mcl_blackstone:blackstone"},
+		place_on = {"mcl_blackstone:basalt", "blocks:netherrack", "mcl_blackstone:blackstone"},
 		sidelen = 80,
 		fill_ratio = 0.082323,
 		biomes = {"BasaltDelta"},
@@ -5990,7 +5990,7 @@ local function register_dimension_decorations()
 	minetest.register_decoration({
 		deco_type = "simple",
 		decoration = "mcl_nether:nether_lava_source",
-		place_on = {"mcl_blackstone:basalt", "mcl_nether:netherrack", "mcl_blackstone:blackstone"},
+		place_on = {"mcl_blackstone:basalt", "blocks:netherrack", "mcl_blackstone:blackstone"},
 		spawn_by = {"mcl_blackstone:basalt", "mcl_blackstone:blackstone"},
 		num_spawn_by = 14,
 		sidelen = 80,
diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index c913aed7a..49538aff7 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -74,7 +74,7 @@ local c_void = minetest.get_content_id("mcl_core:void")
 local c_lava = minetest.get_content_id("mcl_core:lava_source")
 local c_water = minetest.get_content_id("mcl_core:water_source")
 local c_soul_sand = minetest.get_content_id("mcl_nether:soul_sand")
-local c_netherrack = minetest.get_content_id("mcl_nether:netherrack")
+local c_netherrack = minetest.get_content_id("blocks:netherrack")
 local c_nether_lava = minetest.get_content_id("mcl_nether:nether_lava_source")
 --local c_end_stone = minetest.get_content_id("mcl_end:end_stone")
 local c_realm_barrier = minetest.get_content_id("mcl_core:realm_barrier")
diff --git a/mods/MAPGEN/mcl_mapgen_core/ores.lua b/mods/MAPGEN/mcl_mapgen_core/ores.lua
index a8dbf5ee8..89c27ec76 100644
--- a/mods/MAPGEN/mcl_mapgen_core/ores.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/ores.lua
@@ -131,7 +131,7 @@ minetest.register_ore({
 minetest.register_ore({
 	ore_type       = "blob",
 	ore            = "blocks:tuff",
-	wherein        = {"blocks:stone", "blocks:diorite", "blocks:andesite", "blocks:granite", "mcl_deepslate:deepslate" },
+	wherein        = {"blocks:stone", "blocks:diorite", "blocks:andesite", "blocks:granite", "blocks:deepslate"},
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 58,
 	clust_size     = 7,
@@ -154,8 +154,8 @@ if minetest.settings:get_bool("mcl_generate_deepslate", true) then
 
 	minetest.register_ore({
 		ore_type       = "blob",
-		ore            = "mcl_deepslate:deepslate",
-		wherein        = { "blocks:stone" },
+		ore            = "blocks:deepslate",
+		wherein        = {"blocks:stone"},
 		clust_scarcity = 200,
 		clust_num_ores = 100,
 		clust_size     = 10,
@@ -176,7 +176,7 @@ if minetest.settings:get_bool("mcl_generate_deepslate", true) then
 	minetest.register_ore({
 		ore_type       = "scatter",
 		ore            = "mcl_deepslate:infested_deepslate",
-		wherein        = "mcl_deepslate:deepslate",
+		wherein        = "blocks:deepslate",
 		clust_scarcity = 26 * 26 * 26,
 		clust_num_ores = 3,
 		clust_size     = 2,
@@ -188,7 +188,7 @@ if minetest.settings:get_bool("mcl_generate_deepslate", true) then
 	minetest.register_ore({
 		ore_type       = "scatter",
 		ore            = "mcl_core:water_source",
-		wherein        = "mcl_deepslate:deepslate",
+		wherein        = "blocks:deepslate",
 		clust_scarcity = 9000,
 		clust_num_ores = 1,
 		clust_size     = 1,
@@ -199,7 +199,7 @@ if minetest.settings:get_bool("mcl_generate_deepslate", true) then
 	minetest.register_ore({
 		ore_type       = "scatter",
 		ore            = "mcl_core:lava_source",
-		wherein        = "mcl_deepslate:deepslate",
+		wherein        = "blocks:deepslate",
 		clust_scarcity = 2000,
 		clust_num_ores = 1,
 		clust_size     = 1,
@@ -210,7 +210,7 @@ if minetest.settings:get_bool("mcl_generate_deepslate", true) then
 	minetest.register_ore({
 		ore_type       = "scatter",
 		ore            = "mcl_core:lava_source",
-		wherein        = "mcl_deepslate:deepslate",
+		wherein        = "blocks:deepslate",
 		clust_scarcity = 9000,
 		clust_num_ores = 1,
 		clust_size     = 1,
@@ -444,7 +444,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then
 		--
 	-- Ancient debris
 	--
-	local ancient_debris_wherein = {"mcl_nether:netherrack","mcl_blackstone:blackstone","mcl_blackstone:basalt"}
+	local ancient_debris_wherein = {"blocks:netherrack","mcl_blackstone:blackstone","mcl_blackstone:basalt"}
 	-- Common spawn
 	minetest.register_ore({
 		ore_type       = "scatter",
@@ -677,7 +677,7 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then
 			minetest.register_ore({
 				ore_type       = "scatter",
 				ore            = ore,
-				wherein        = { "mcl_deepslate:deepslate", "blocks:tuff" },
+				wherein        = { "blocks:deepslate", "blocks:tuff" },
 				clust_scarcity = scarcity,
 				clust_num_ores = num,
 				clust_size     = size,
diff --git a/mods/MAPGEN/mcl_nether_fortresses/init.lua b/mods/MAPGEN/mcl_nether_fortresses/init.lua
index 84823d106..51ac91299 100644
--- a/mods/MAPGEN/mcl_nether_fortresses/init.lua
+++ b/mods/MAPGEN/mcl_nether_fortresses/init.lua
@@ -6,7 +6,7 @@ local peaceful = minetest.settings:get_bool("only_peaceful_mobs", false)
 local BLAZE_SPAWNER_MAX_LIGHT = 11
 
 mcl_structures.register_structure("nether_outpost",{
-	place_on = {"mcl_nether:netherrack","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium","mcl_blackstone:basalt","mcl_blackstone:soul_soil","mcl_blackstone:blackstone","mcl_nether:soul_sand"},
+	place_on = {"blocks:netherrack","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium","mcl_blackstone:basalt","mcl_blackstone:soul_soil","mcl_blackstone:blackstone","mcl_nether:soul_sand"},
 	fill_ratio = 0.01,
 	chunk_probability = 900,
 	flags = "all_floors",
@@ -31,7 +31,7 @@ local nbridges = {
 		modpath.."/schematics/mcl_nether_fortresses_nether_bridge_4.mts",
 }
 mcl_structures.register_structure("nether_bridge",{
-	place_on = {"mcl_nether:nether_lava_source","mcl_nether:netherrack","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium","mcl_blackstone:basalt","mcl_blackstone:soul_soil","mcl_blackstone:blackstone","mcl_nether:soul_sand","mcl_core:bedrock"},
+	place_on = {"mcl_nether:nether_lava_source","blocks:netherrack","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium","mcl_blackstone:basalt","mcl_blackstone:soul_soil","mcl_blackstone:blackstone","mcl_nether:soul_sand","mcl_core:bedrock"},
 	fill_ratio = 0.01,
 	chunk_probability = 500,
 	flags = "all_floors",
@@ -50,7 +50,7 @@ mcl_structures.register_structure("nether_bridge",{
 })
 
 mcl_structures.register_structure("nether_outpost_with_bridges",{
-	place_on = {"mcl_nether:netherrack","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium","mcl_blackstone:basalt","mcl_blackstone:soul_soil","mcl_blackstone:blackstone","mcl_nether:soul_sand","mcl_nether:nether_lava_source"},
+	place_on = {"blocks:netherrack","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium","mcl_blackstone:basalt","mcl_blackstone:soul_soil","mcl_blackstone:blackstone","mcl_nether:soul_sand","mcl_nether:nether_lava_source"},
 	fill_ratio = 0.01,
 	chunk_probability = 1300,
 	flags = "all_floors",
@@ -114,7 +114,7 @@ mcl_structures.register_structure_spawn({
 })
 
 mcl_structures.register_structure("nether_bulwark",{
-	place_on = {"mcl_nether:netherrack","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium","mcl_blackstone:basalt","mcl_blackstone:soul_soil","mcl_blackstone:blackstone","mcl_nether:soul_sand"},
+	place_on = {"blocks:netherrack","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium","mcl_blackstone:basalt","mcl_blackstone:soul_soil","mcl_blackstone:blackstone","mcl_nether:soul_sand"},
 	fill_ratio = 0.01,
 	chunk_probability = 900,
 	flags = "all_floors",
diff --git a/mods/MAPGEN/mcl_structures/geode.lua b/mods/MAPGEN/mcl_structures/geode.lua
index 56453ee60..9676e7ba1 100644
--- a/mods/MAPGEN/mcl_structures/geode.lua
+++ b/mods/MAPGEN/mcl_structures/geode.lua
@@ -44,7 +44,7 @@ local function makegeode(pos,def,pr)
 				local an = minetest.get_node(pp)
 				if an.name ~= "mcl_amethyst:amethyst_block" then
 					if minetest.get_item_group(an.name,"material_stone") > 0 then
-						set_node_no_bedrock(pp,{name="mcl_amethyst:calcite"})
+						set_node_no_bedrock(pp,{name="blocks:calcite"})
 						table.insert(calcite,pp)
 						if pr:next(1,5) == 1 then
 							set_node_no_bedrock(v,{name="mcl_amethyst:budding_amethyst_block"})
diff --git a/mods/MAPGEN/mcl_structures/ruined_portal.lua b/mods/MAPGEN/mcl_structures/ruined_portal.lua
index ef8c806ca..97b49ceb4 100644
--- a/mods/MAPGEN/mcl_structures/ruined_portal.lua
+++ b/mods/MAPGEN/mcl_structures/ruined_portal.lua
@@ -35,7 +35,7 @@ local def = {
 		local p2 = vector.offset(pos,hl,hl,hl)
 		local gold = minetest.find_nodes_in_area(p1,p2,{"mcl_core:goldblock"})
 		local lava = minetest.find_nodes_in_area(p1,p2,{"mcl_core:lava_source"})
-		local rack = minetest.find_nodes_in_area(p1,p2,{"mcl_nether:netherrack"})
+		local rack = minetest.find_nodes_in_area(p1,p2,{"blocks:netherrack"})
 		local brick = minetest.find_nodes_in_area(p1,p2,{"mcl_core:stonebrick"})
 		local obby = minetest.find_nodes_in_area(p1,p2,{"mcl_core:obsidian"})
 		minetest.bulk_set_node(get_replacements(gold,30,pr),{name="air"})
@@ -102,9 +102,9 @@ local def = {
 		}}
 	}
 }
-mcl_structures.register_structure("ruined_portal_overworld",def)
+mcl_structures.register_structure("ruined_portal_overworld", def)
 local ndef = table.copy(def)
 ndef.y_min=mcl_vars.mg_lava_nether_max +10
 ndef.y_max=mcl_vars.mg_nether_max - 15
-ndef.place_on = {"mcl_nether:netherrack","group:soul_block","mcl_blackstone:basalt,mcl_blackstone:blackstone","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium"},
-mcl_structures.register_structure("ruined_portal_nether",ndef)
+ndef.place_on = {"blocks:netherrack","group:soul_block","mcl_blackstone:basalt,mcl_blackstone:blackstone","mcl_crimson:crimson_nylium","mcl_crimson:warped_nylium"},
+mcl_structures.register_structure("ruined_portal_nether", ndef)
diff --git a/mods/MAPGEN/mcl_terrain_features/init.lua b/mods/MAPGEN/mcl_terrain_features/init.lua
index 188ba1d0d..8a143589e 100644
--- a/mods/MAPGEN/mcl_terrain_features/init.lua
+++ b/mods/MAPGEN/mcl_terrain_features/init.lua
@@ -343,7 +343,7 @@ mcl_structures.register_structure("lavadelta",{
 	y_min = mcl_vars.mg_lava_nether_max + 1,
 	biomes = { "BasaltDelta" },
 	place_func = function(pos,def,pr)
-		local nn = minetest.find_nodes_in_area_under_air(vector.offset(pos,-10,-1,-10),vector.offset(pos,10,-2,10),{"mcl_blackstone:basalt","mcl_blackstone:blackstone","mcl_nether:netherrack"})
+		local nn = minetest.find_nodes_in_area_under_air(vector.offset(pos,-10,-1,-10), vector.offset(pos,10,-2,10), {"mcl_blackstone:basalt", "mcl_blackstone:blackstone", "blocks:netherrack"})
 		table.sort(nn,function(a, b)
 		   return vector.distance(vector.new(pos.x,0,pos.z), a) < vector.distance(vector.new(pos.x,0,pos.z), b)
 		end)
diff --git a/mods/blocks/natural/stone.lua b/mods/blocks/natural/stone.lua
index 6c4c3996b..653e2d23a 100644
--- a/mods/blocks/natural/stone.lua
+++ b/mods/blocks/natural/stone.lua
@@ -5,6 +5,23 @@ local blocks = {
         groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
         sounds = mcl_sounds.node_sound_stone_defaults()
     },
+    ["calcite"] = {
+        _mcl_blast_resistance = 0.75,
+        _mcl_hardness = 0.75,
+        groups = {natural_blocks = 1, pickaxey = 1},
+        sounds = mcl_sounds.node_sound_stone_defaults()
+    },
+    ["deepslate"] = {
+        _mcl_blast_resistance = 6,
+        _mcl_hardness = 3,
+        _mcl_silk_touch_drop = true,
+        drop = "blocks:cobbled_deepslate",
+        groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
+        on_place = minetest.rotate_node,
+        paramtype2 = "facedir",
+        sounds = mcl_sounds.node_sound_stone_defaults(),
+        tiles = {type = "loglike"}
+    },
     ["diorite"] = {
         _mcl_blast_resistance = 6,
         _mcl_hardness = 1.5,
@@ -17,9 +34,17 @@ local blocks = {
         groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
         sounds = mcl_sounds.node_sound_stone_defaults()
     },
+    ["netherrack"] = {
+        _mcl_blast_resistance = 0.4,
+        _mcl_hardness = 0.4,
+        groups = {natural_blocks = 1, pickaxey = 1},
+        sounds = mcl_sounds.node_sound_stone_defaults()
+    },
     ["stone"] = {
         _mcl_blast_resistance = 6,
         _mcl_hardness = 1.5,
+        _mcl_silk_touch_drop = true,
+        drop = "blocks:cobblestone",
         groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
         sounds = mcl_sounds.node_sound_stone_defaults()
     },
diff --git a/textures/building/chiseled_deepslate.png b/textures/building/chiseled_deepslate.png
new file mode 100644
index 000000000..19955d578
Binary files /dev/null and b/textures/building/chiseled_deepslate.png differ
diff --git a/textures/building/cobbled_deepslate.png b/textures/building/cobbled_deepslate.png
new file mode 100644
index 000000000..102ede141
Binary files /dev/null and b/textures/building/cobbled_deepslate.png differ
diff --git a/textures/building/cracked_deepslate_tiles.png b/textures/building/cracked_deepslate_tiles.png
new file mode 100644
index 000000000..c62f36d92
Binary files /dev/null and b/textures/building/cracked_deepslate_tiles.png differ
diff --git a/textures/building/deepslate_tiles.png b/textures/building/deepslate_tiles.png
new file mode 100644
index 000000000..43fe0f319
Binary files /dev/null and b/textures/building/deepslate_tiles.png differ
diff --git a/textures/natural/natural_calcite.png b/textures/natural/natural_calcite.png
new file mode 100644
index 000000000..862e878b5
Binary files /dev/null and b/textures/natural/natural_calcite.png differ
diff --git a/textures/natural/natural_deepslate.png b/textures/natural/natural_deepslate.png
new file mode 100644
index 000000000..196bca83c
Binary files /dev/null and b/textures/natural/natural_deepslate.png differ
diff --git a/textures/natural/natural_deepslate_top.png b/textures/natural/natural_deepslate_top.png
new file mode 100644
index 000000000..56e3a9022
Binary files /dev/null and b/textures/natural/natural_deepslate_top.png differ
diff --git a/textures/natural/natural_netherrack.png b/textures/natural/natural_netherrack.png
new file mode 100644
index 000000000..1b9733244
Binary files /dev/null and b/textures/natural/natural_netherrack.png differ