diff --git a/mods/ITEMS/REDSTONE/mesecons_button/init.lua b/mods/ITEMS/REDSTONE/mesecons_button/init.lua
index 7a1ffa8e4..c49dcba48 100644
--- a/mods/ITEMS/REDSTONE/mesecons_button/init.lua
+++ b/mods/ITEMS/REDSTONE/mesecons_button/init.lua
@@ -220,30 +220,6 @@ function mesecon.register_button(basename, description, texture, recipeitem, sou
 	end
 end
 
-mesecon.register_button(
-	"stone",
-	S("Stone Button"),
-	"default_stone.png",
-	"mcl_core:stone",
-	mcl_sounds.node_sound_stone_defaults(),
-	{material_stone=1,handy=1,pickaxey=1},
-	1,
-	false,
-	S("A stone button is a redstone component made out of stone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second."),
-	"mesecons_button_push")
-
-mesecon.register_button(
-	"polished_blackstone",
-	S("Polished Blackstone Button"),
-	"mcl_blackstone_polished.png",
-	"mcl_blackstone:blackstone_polished",
-	mcl_sounds.node_sound_stone_defaults(),
-	{material_stone=1,handy=1,pickaxey=1},
-	1,
-	false,
-	S("A polished blackstone button is a redstone component made out of polished blackstone which can be pushed to provide redstone power. When pushed, it powers adjacent redstone components for 1 second."),
-	"mesecons_button_push")
-
 local woods = {
 	{ "wood", "mcl_core:wood", "default_wood.png", S("Oak Button") },
 	{ "acaciawood", "mcl_core:acaciawood", "default_acacia_wood.png", S("Acacia Button") },
diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua
index 7be072b3d..224722ffd 100644
--- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua
+++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua
@@ -249,31 +249,3 @@ for w=1, #woods do
 	})
 
 end
-
-mesecon.register_pressure_plate(
-	"mesecons_pressureplates:pressure_plate_stone",
-	S("Stone Pressure Plate"),
-	{"default_stone.png"},
-	{"default_stone.png"},
-	"default_stone.png",
-	nil,
-	{{"mcl_core:stone", "mcl_core:stone"}},
-	mcl_sounds.node_sound_stone_defaults(),
-	{pickaxey=1, material_stone=1},
-	{ player = true, mob = true },
-	S("A stone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else."))
-
-mesecon.register_pressure_plate(
-	"mesecons_pressureplates:pressure_plate_polished_blackstone",
-	S("Polished Blackstone Pressure Plate"),
-	{"mcl_blackstone_polished.png"},
-	{"mcl_blackstone_polished.png"},
-	"mcl_blackstone_polished.png",
-	nil,
-	{{"mcl_blackstone:blackstone_polished", "mcl_blackstone:blackstone_polished"}},
-	mcl_sounds.node_sound_stone_defaults(),
-	{pickaxey=1, material_stone=1},
-	{ player = true, mob = true },
-	S("A polished blackstone pressure plate is a redstone component which supplies its surrounding blocks with redstone power while a player or mob stands on top of it. It is not triggered by anything else."))
-
-
diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua
index 626966ba8..d474e52a0 100644
--- a/mods/ITEMS/mcl_core/nodes_base.lua
+++ b/mods/ITEMS/mcl_core/nodes_base.lua
@@ -20,24 +20,6 @@ mcl_core.fortune_drop_ore = {
 	multiply = true,
 }
 
-minetest.register_node("mcl_core:stone", {
-	description = S("Stone"),
-	tiles = {"default_stone.png"},
-	is_ground_content = true,
-	stack_max = 64,
-	groups = {pickaxey=1, stone=1, building_block=1, material_stone=1},
-	drop = "mcl_core:cobble",
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 6,
-	_mcl_hardness = 1.5,
-	_mcl_silk_touch_drop = true,
-	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		if awards and awards.unlock and digger and digger:is_player() then
-			awards.unlock(digger:get_player_name(), "mcl:stoneAge")
-		end
-	end,
-})
-
 minetest.register_node("mcl_core:stone_with_coal", {
 	description = S("Coal Ore"),
 	tiles = {"mcl_core_coal_ore.png"},
@@ -220,39 +202,6 @@ minetest.register_node("mcl_core:stone_with_diamond", {
 	_mcl_fortune_drop = mcl_core.fortune_drop_ore,
 })
 
-minetest.register_node("mcl_core:granite", {
-	description = S("Granite"),
-	tiles = {"mcl_core_granite.png"},
-	is_ground_content = true,
-	stack_max = 64,
-	groups = {pickaxey=1, stone=1, building_block=1, material_stone=1},
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 6,
-	_mcl_hardness = 1.5,
-})
-
-minetest.register_node("mcl_core:andesite", {
-	description = S("Andesite"),
-	tiles = {"mcl_core_andesite.png"},
-	is_ground_content = true,
-	stack_max = 64,
-	groups = {pickaxey=1, stone=1, building_block=1, material_stone=1},
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 6,
-	_mcl_hardness = 1.5,
-})
-
-minetest.register_node("mcl_core:diorite", {
-	description = S("Diorite"),
-	tiles = {"mcl_core_diorite.png"},
-	is_ground_content = true,
-	stack_max = 64,
-	groups = {pickaxey=1, stone=1, building_block=1, material_stone=1},
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 6,
-	_mcl_hardness = 1.5,
-})
-
 -- Grass Block
 minetest.register_node("mcl_core:dirt_with_grass", {
 	description = S("Grass Block"),
diff --git a/mods/ITEMS/mcl_deepslate/init.lua b/mods/ITEMS/mcl_deepslate/init.lua
index 6226ccaa6..2abe9d91f 100644
--- a/mods/ITEMS/mcl_deepslate/init.lua
+++ b/mods/ITEMS/mcl_deepslate/init.lua
@@ -42,18 +42,6 @@ minetest.register_node("mcl_deepslate:infested_deepslate", {
 	_mcl_blast_resistance = 0.5,
 })
 
-minetest.register_node("mcl_deepslate:tuff", {
-	description = S("Tuff"),
-	_doc_items_longdesc = S("Tuff is an ornamental rock formed from volcanic ash, occurring in underground blobs below Y=16."),
-	_doc_items_hidden = false,
-	tiles = { "mcl_deepslate_tuff.png" },
-	groups = { pickaxey = 1, deco_block = 1 },
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 6,
-	_mcl_hardness = 1.5,
-	_mcl_silk_touch_drop = true,
-})
-
 local function register_deepslate_ore(desc, drop, cooked, pick, xp)
 	local item = desc:lower()
 	local item_string
diff --git a/mods/ITEMS/mcl_monster_eggs/init.lua b/mods/ITEMS/mcl_monster_eggs/init.lua
index 33bc2c463..0a897f20b 100644
--- a/mods/ITEMS/mcl_monster_eggs/init.lua
+++ b/mods/ITEMS/mcl_monster_eggs/init.lua
@@ -28,13 +28,3 @@ local function register_block(subname, description, tiles, is_ground_content)
 		_mcl_blast_resistance = 0.5,
 	})
 end
-
--- Register all the monster egg blocks
-register_block("stone", S("Infested Stone"), {"default_stone.png"}, true)
-register_block("cobble", S("Infested Cobblestone"), {"default_cobble.png"})
-register_block("stonebrick", S("Infested Stone Bricks"), {"building_stone_bricks.png"})
-register_block("stonebrickcracked", S("Infested Cracked Stone Bricks"), {"mcl_core_stonebrick_cracked.png"})
-register_block("stonebrickmossy", S("Infested Mossy Stone Bricks"), {"mcl_core_stonebrick_mossy.png"})
-register_block("stonebrickcarved", S("Infested Chiseled Stone Bricks"), {"mcl_core_stonebrick_carved.png"})
-
-
diff --git a/mods/ITEMS/mcl_stairs/register.lua b/mods/ITEMS/mcl_stairs/register.lua
index b4b142826..934716743 100644
--- a/mods/ITEMS/mcl_stairs/register.lua
+++ b/mods/ITEMS/mcl_stairs/register.lua
@@ -30,55 +30,6 @@ for w=1, #woods do
 			wood[5])
 end
 
-
-mcl_stairs.register_slab("stone_rough", "mcl_core:stone",
-		{pickaxey=1, material_stone=1},
-		{"default_stone.png"},
-		S("Stone Slab"),
-		mcl_sounds.node_sound_stone_defaults(), 6, 2,
-		S("Double Stone Slab"))
-mcl_stairs.register_stair("stone_rough", "mcl_core:stone",
-		{pickaxey=1, material_stone=1},
-		{"default_stone.png"},
-		S("Stone Stairs"),
-		mcl_sounds.node_sound_stone_defaults(), 0.8, 0.8)
-
-mcl_stairs.register_stair("andesite", "mcl_core:andesite",
-		{pickaxey=1, material_stone=1},
-		{"mcl_core_andesite.png"},
-		S("Andesite Stairs"),
-		mcl_sounds.node_sound_stone_defaults(), 0.8, 0.8)
-mcl_stairs.register_slab("andesite", "mcl_core:andesite",
-		{pickaxey=1, material_stone=1},
-		{"mcl_core_andesite.png"},
-		S("Andesite Slab"),
-		mcl_sounds.node_sound_stone_defaults(), 6, 2,
-		S("Double Andesite Slab"))
-
-mcl_stairs.register_stair("granite", "mcl_core:granite",
-		{pickaxey=1, material_stone=1},
-		{"mcl_core_granite.png"},
-		S("Granite Stairs"),
-		mcl_sounds.node_sound_stone_defaults(), 0.8, 0.8)
-mcl_stairs.register_slab("granite", "mcl_core:granite",
-		{pickaxey=1, material_stone=1},
-		{"mcl_core_granite.png"},
-		S("Granite Slab"),
-		mcl_sounds.node_sound_stone_defaults(), 6, 2,
-		S("Double Granite Slab"))
-
-mcl_stairs.register_stair("diorite", "mcl_core:diorite",
-		{pickaxey=1, material_stone=1},
-		{"mcl_core_diorite.png"},
-		S("Granite Stairs"),
-		mcl_sounds.node_sound_stone_defaults(), 0.8, 0.8)
-mcl_stairs.register_slab("diorite", "mcl_core:diorite",
-		{pickaxey=1, material_stone=1},
-		{"mcl_core_diorite.png"},
-		S("Diorite Slab"),
-		mcl_sounds.node_sound_stone_defaults(), 6, 2,
-		S("Double Diorite Slab"))
-
 mcl_stairs.register_stair("cobble", "mcl_core:cobble",
 		{pickaxey=1, material_stone=1},
 		{"default_cobble.png"},
diff --git a/mods/ITEMS/mcl_walls/register.lua b/mods/ITEMS/mcl_walls/register.lua
index 65c3e733a..8ff4af0ce 100644
--- a/mods/ITEMS/mcl_walls/register.lua
+++ b/mods/ITEMS/mcl_walls/register.lua
@@ -2,9 +2,5 @@ local S = minetest.get_translator(minetest.get_current_modname())
 
 mcl_walls.register_wall("mcl_walls:cobble", S("Cobblestone Wall"), "mcl_core:cobble", {"mcl_walls_cobble_wall_top.png", "default_cobble.png", "mcl_walls_cobble_wall_side.png"})
 mcl_walls.register_wall("mcl_walls:mossycobble", S("Mossy Cobblestone Wall"), "mcl_core:mossycobble", {"mcl_walls_cobble_mossy_wall_top.png", "default_mossycobble.png", "mcl_walls_cobble_mossy_wall_side.png"})
-mcl_walls.register_wall("mcl_walls:andesite", S("Andesite Wall"), "mcl_core:andesite")
-mcl_walls.register_wall("mcl_walls:granite", S("Granite Wall"), "mcl_core:granite")
-mcl_walls.register_wall("mcl_walls:diorite", S("Diorite Wall"), "mcl_core:diorite")
 mcl_walls.register_wall("mcl_walls:sandstone", S("Sandstone Wall"), "mcl_core:sandstone")
 mcl_walls.register_wall("mcl_walls:redsandstone", S("Red Sandstone Wall"), "mcl_core:redsandstone")
-    
\ No newline at end of file
diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index b3b825071..3d116dc30 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -2573,7 +2573,7 @@ end
 
 -- Register ores which are limited by biomes. For all mapgens except flat and singlenode.
 local function register_biome_ores()
-	local stonelike = {"mcl_core:stone", "mcl_core:diorite", "mcl_core:andesite", "mcl_core:granite"}
+	local stonelike = {"blocks:stone", "blocks:diorite", "blocks:andesite", "blocks:granite"}
 
 	-- Emeralds
 	minetest.register_ore({
@@ -2603,7 +2603,7 @@ local function register_biome_ores()
 	minetest.register_ore({
 		ore_type = "scatter",
 		ore = "mcl_monster_eggs:monster_egg_stone",
-		wherein = "mcl_core:stone",
+		wherein = "blocks:stone",
 		clust_scarcity = monster_egg_scarcity,
 		clust_num_ores = 3,
 		clust_size = 2,
@@ -2846,7 +2846,7 @@ local function register_biomelike_ores()
 	-- For a transition from stone to hardened clay in mesa biomes that is not perfectly flat
 	minetest.register_ore({
 		ore_type = "stratum",
-		ore = "mcl_core:stone",
+		ore = "blocks:stone",
 		wherein = {"group:hardened_clay"},
 		noise_params = {offset = -6, scale = 2, spread = {x = 25, y = 25, z = 25}, octaves = 1, persist = 0.60},
 		stratum_thickness = 8,
@@ -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", "mcl_core:stone"},
+		wherein = {"mcl_nether: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", "mcl_core:stone"},
+		wherein = {"mcl_nether:netherrack", "blocks:stone"},
 		clust_scarcity = 8 * 8 * 8,
 		clust_num_ores = 45,
 		clust_size = 6,
@@ -3095,7 +3095,7 @@ local function register_dimension_ores()
 	minetest.register_ore({
 		ore_type = "blob",
 		ore = "mcl_nether:glowstone",
-		wherein = {"mcl_nether:netherrack", "mcl_core:stone"},
+		wherein = {"mcl_nether: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", "mcl_core:stone"},
+		wherein = {"mcl_nether: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", "mcl_core:stone"},
+			wherein = {"mcl_nether: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", "mcl_core:stone"},
+			wherein = {"mcl_nether: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", "mcl_core:stone"},
+		wherein = {"mcl_nether: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", "mcl_core:stone"},
+		wherein = {"mcl_nether: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", "mcl_core:stone"},
+		wherein = {"mcl_nether: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", "mcl_core:stone"},
+		wherein = {"mcl_nether: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", "mcl_core:stone"},
+		wherein = {"mcl_nether:netherrack", "blocks:stone"},
 		clust_scarcity = 3500,
 		clust_num_ores = 1,
 		clust_size = 1,
@@ -3225,7 +3225,7 @@ local function register_dimension_ores()
 
 	local end_wherein
 	if mg_name == "v6" then
-		end_wherein = {"air", "mcl_core:stone"}
+		end_wherein = {"air", "blocks:stone"}
 	else
 		end_wherein = {"air"}
 	end
@@ -5552,7 +5552,7 @@ local function register_decorations()
 		-- Mushrooms next to trees
 		minetest.register_decoration({
 			deco_type = "simple",
-			place_on = {"group:grass_block_no_snow", "mcl_core:dirt", "mcl_core:podzol", "mcl_core:mycelium", "mcl_core:stone", "mcl_core:andesite", "mcl_core:diorite", "mcl_core:granite"},
+			place_on = {"group:grass_block_no_snow", "mcl_core:dirt", "mcl_core:podzol", "mcl_core:mycelium", "blocks:stone", "blocks:andesite", "blocks:diorite", "blocks:granite"},
 			sidelen = 16,
 			noise_params = {
 				offset = 0,
@@ -5572,7 +5572,7 @@ local function register_decorations()
 		-- More mushrooms in Swampland
 		minetest.register_decoration({
 			deco_type = "simple",
-			place_on = {"group:grass_block_no_snow", "mcl_core:dirt", "mcl_core:podzol", "mcl_core:mycelium", "mcl_core:stone", "mcl_core:andesite", "mcl_core:diorite", "mcl_core:granite"},
+			place_on = {"group:grass_block_no_snow", "mcl_core:dirt", "mcl_core:podzol", "mcl_core:mycelium", "blocks:stone", "blocks:andesite", "blocks:diorite", "blocks:granite"},
 			sidelen = 16,
 			noise_params = {
 				offset = 0.05,
diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index dfea4f3ce..c913aed7a 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -13,7 +13,7 @@ local modpath = minetest.get_modpath(modname)
 --
 
 minetest.register_alias("mapgen_air", "air")
-minetest.register_alias("mapgen_stone", "mcl_core:stone")
+minetest.register_alias("mapgen_stone", "blocks:stone")
 minetest.register_alias("mapgen_tree", "mcl_core:tree")
 minetest.register_alias("mapgen_leaves", "mcl_core:leaves")
 minetest.register_alias("mapgen_jungletree", "mcl_core:jungletree")
@@ -63,7 +63,7 @@ local superflat = mg_name == "flat" and minetest.get_mapgen_setting("mcl_superfl
 -- Content IDs
 local c_bedrock = minetest.get_content_id("mcl_core:bedrock")
 local c_obsidian = minetest.get_content_id("mcl_core:obsidian")
-local c_stone = minetest.get_content_id("mcl_core:stone")
+local c_stone = minetest.get_content_id("blocks:stone")
 local c_dirt = minetest.get_content_id("mcl_core:dirt")
 local c_dirt_with_grass = minetest.get_content_id("mcl_core:dirt_with_grass")
 local c_dirt_with_grass_snow = minetest.get_content_id("mcl_core:dirt_with_grass_snow")
diff --git a/mods/MAPGEN/mcl_mapgen_core/ores.lua b/mods/MAPGEN/mcl_mapgen_core/ores.lua
index 3eeaefef8..a8dbf5ee8 100644
--- a/mods/MAPGEN/mcl_mapgen_core/ores.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/ores.lua
@@ -17,7 +17,7 @@ local mountains = {
 minetest.register_ore({
 	ore_type       = "blob",
 	ore            = "mcl_core:clay",
-	wherein        = {"mcl_core:sand","mcl_core:stone","mcl_core:gravel"},
+	wherein        = {"mcl_core:sand","blocks:stone","mcl_core:gravel"},
 	clust_scarcity = 15*15*15,
 	clust_num_ores = 33,
 	clust_size     = 5,
@@ -36,13 +36,13 @@ minetest.register_ore({
 })
 
 -- Diorite, andesite and granite
-local specialstones = { "mcl_core:diorite", "mcl_core:andesite", "mcl_core:granite" }
+local specialstones = { "blocks:diorite", "blocks:andesite", "blocks:granite" }
 for s=1, #specialstones do
 	local node = specialstones[s]
 	minetest.register_ore({
 		ore_type       = "blob",
 		ore            = node,
-		wherein        = {"mcl_core:stone"},
+		wherein        = {"blocks:stone"},
 		clust_scarcity = 15*15*15,
 		clust_num_ores = 33,
 		clust_size     = 5,
@@ -62,7 +62,7 @@ for s=1, #specialstones do
 	minetest.register_ore({
 		ore_type       = "blob",
 		ore            = node,
-		wherein        = {"mcl_core:stone"},
+		wherein        = {"blocks:stone"},
 		clust_scarcity = 10*10*10,
 		clust_num_ores = 58,
 		clust_size     = 7,
@@ -81,7 +81,7 @@ for s=1, #specialstones do
 	})
 end
 
-local stonelike = {"mcl_core:stone", "mcl_core:diorite", "mcl_core:andesite", "mcl_core:granite"}
+local stonelike = {"blocks:stone", "blocks:diorite", "blocks:andesite", "blocks:granite"}
 
 -- Dirt
 minetest.register_ore({
@@ -130,8 +130,8 @@ minetest.register_ore({
 
 minetest.register_ore({
 	ore_type       = "blob",
-	ore            = "mcl_deepslate:tuff",
-	wherein        = { "mcl_core:stone", "mcl_core:diorite", "mcl_core:andesite", "mcl_core:granite", "mcl_deepslate:deepslate" },
+	ore            = "blocks:tuff",
+	wherein        = {"blocks:stone", "blocks:diorite", "blocks:andesite", "blocks:granite", "mcl_deepslate:deepslate" },
 	clust_scarcity = 10*10*10,
 	clust_num_ores = 58,
 	clust_size     = 7,
@@ -155,7 +155,7 @@ if minetest.settings:get_bool("mcl_generate_deepslate", true) then
 	minetest.register_ore({
 		ore_type       = "blob",
 		ore            = "mcl_deepslate:deepslate",
-		wherein        = { "mcl_core:stone" },
+		wherein        = { "blocks:stone" },
 		clust_scarcity = 200,
 		clust_num_ores = 100,
 		clust_size     = 10,
@@ -172,7 +172,7 @@ if minetest.settings:get_bool("mcl_generate_deepslate", true) then
 			flags = "defaults",
 		}
 	})
-	
+
 	minetest.register_ore({
 		ore_type       = "scatter",
 		ore            = "mcl_deepslate:infested_deepslate",
@@ -671,13 +671,13 @@ if minetest.settings:get_bool("mcl_generate_ores", true) then
 	})
 
 	if minetest.settings:get_bool("mcl_generate_deepslate", true) then
-			local stonelike = { "mcl_core:stone", "mcl_core:diorite", "mcl_core:andesite", "mcl_core:granite" }
+			local stonelike = { "blocks:stone", "blocks:diorite", "blocks:andesite", "blocks:granite" }
 		local function register_ore_mg(ore, scarcity, num, size, y_min, y_max, biomes)
 			biomes = biomes or ""
 			minetest.register_ore({
 				ore_type       = "scatter",
 				ore            = ore,
-				wherein        = { "mcl_deepslate:deepslate", "mcl_deepslate:tuff" },
+				wherein        = { "mcl_deepslate:deepslate", "blocks:tuff" },
 				clust_scarcity = scarcity,
 				clust_num_ores = num,
 				clust_size     = size,
@@ -748,7 +748,7 @@ if not superflat then
 minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "mcl_core:water_source",
-	wherein         = {"mcl_core:stone", "mcl_core:andesite", "mcl_core:diorite", "mcl_core:granite", "mcl_core:dirt"},
+	wherein         = {"blocks:stone", "blocks:andesite", "blocks:diorite", "blocks:granite", "mcl_core:dirt"},
 	clust_scarcity = 9000,
 	clust_num_ores = 1,
 	clust_size     = 1,
diff --git a/mods/MAPGEN/mcl_structures/api.lua b/mods/MAPGEN/mcl_structures/api.lua
index cf47b4e30..bd77bddfa 100644
--- a/mods/MAPGEN/mcl_structures/api.lua
+++ b/mods/MAPGEN/mcl_structures/api.lua
@@ -190,7 +190,7 @@ local function get_foundation_nodes(ground_p1,ground_p2,pos,sidelen,node_stone)
 end
 
 local function foundation(ground_p1,ground_p2,pos,sidelen)
-	local node_stone = "mcl_core:stone"
+	local node_stone = "blocks:stone"
 	local node_filler = "mcl_core:dirt"
 	local node_top = "mcl_core:dirt_with_grass" or minetest.get_node(ground_p1).name
 	local node_dust = nil
diff --git a/mods/MAPGEN/mcl_terrain_features/init.lua b/mods/MAPGEN/mcl_terrain_features/init.lua
index eab33e78e..188ba1d0d 100644
--- a/mods/MAPGEN/mcl_terrain_features/init.lua
+++ b/mods/MAPGEN/mcl_terrain_features/init.lua
@@ -66,7 +66,7 @@ local function makelake(pos,size,liquid,placein,border,pr,noair)
 					elseif minetest.get_item_group(minetest.get_node(nn[1]).name,"solid") > 0 then
 						border = minetest.get_node_or_nil(nn[1]).name
 					else
-						border = "mcl_core:stone"
+						border = "blocks:stone"
 					end
 					if border == nil or border == "mcl_core:dirt" then border = "mcl_core:dirt_with_grass" end
 				end
@@ -185,7 +185,7 @@ mcl_structures.register_structure("lavapool",{
 	y_max = mcl_vars.mg_overworld_max,
 	y_min = minetest.get_mapgen_setting("water_level"),
 	place_func = function(pos,def,pr)
-		return makelake(pos,5,"mcl_core:lava_source",{"group:material_stone", "group:sand", "group:dirt"},"mcl_core:stone",pr)
+		return makelake(pos, 5, "mcl_core:lava_source", {"group:material_stone", "group:sand", "group:dirt"}, "blocks:stone", pr)
 	end
 })
 
diff --git a/mods/MAPGEN/mcl_villages/foundation.lua b/mods/MAPGEN/mcl_villages/foundation.lua
index e53a4a3ce..cc256b413 100644
--- a/mods/MAPGEN/mcl_villages/foundation.lua
+++ b/mods/MAPGEN/mcl_villages/foundation.lua
@@ -27,7 +27,7 @@ function settlements.ground(pos, pr, platform_material) -- role model: Wendelste
 		if cnt > 20 then break end
 		if cnt>pr:next(2,4) then
 			if not platform_material then
-				mat = "mcl_core:stone"
+				mat = "blocks:stone"
 			end
 		end
 		minetest.swap_node(p2, {name=mat})
diff --git a/mods/MAPGEN/mcl_villages/init.lua b/mods/MAPGEN/mcl_villages/init.lua
index 6662f6bd1..62380b9d2 100644
--- a/mods/MAPGEN/mcl_villages/init.lua
+++ b/mods/MAPGEN/mcl_villages/init.lua
@@ -18,17 +18,6 @@ local villagegen={}
 --
 -- register block for npc spawn
 --
-minetest.register_node("mcl_villages:stonebrickcarved", {
-	description = S("Chiseled Stone Village Bricks"),
-	_doc_items_longdesc = doc.sub.items.temp.build,
-	tiles = {"mcl_core_stonebrick_carved.png"},
-	drop = "mcl_core:stonebrickcarved",
-	groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, material_stone=1},
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	is_ground_content = false,
-	_mcl_blast_resistance = 6,
-	_mcl_hardness = 1.5,
-})
 
 minetest.register_node("mcl_villages:structblock", {drawtype="airlike",groups = {not_in_creative_inventory=1},})
 
diff --git a/mods/blocks/natural/init.lua b/mods/blocks/natural/init.lua
new file mode 100644
index 000000000..e4096c162
--- /dev/null
+++ b/mods/blocks/natural/init.lua
@@ -0,0 +1 @@
+voxelibre.load_mod_files()
diff --git a/mods/blocks/natural/mod.conf b/mods/blocks/natural/mod.conf
new file mode 100644
index 000000000..960f685c3
--- /dev/null
+++ b/mods/blocks/natural/mod.conf
@@ -0,0 +1,2 @@
+name = natural
+depends = mcl_sounds, voxelibre
diff --git a/mods/blocks/natural/stone.lua b/mods/blocks/natural/stone.lua
new file mode 100644
index 000000000..6c4c3996b
--- /dev/null
+++ b/mods/blocks/natural/stone.lua
@@ -0,0 +1,36 @@
+local blocks = {
+    ["andesite"] = {
+        _mcl_blast_resistance = 6,
+        _mcl_hardness = 1.5,
+        groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
+        sounds = mcl_sounds.node_sound_stone_defaults()
+    },
+    ["diorite"] = {
+        _mcl_blast_resistance = 6,
+        _mcl_hardness = 1.5,
+        groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
+        sounds = mcl_sounds.node_sound_stone_defaults()
+    },
+    ["granite"] = {
+        _mcl_blast_resistance = 6,
+        _mcl_hardness = 1.5,
+        groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
+        sounds = mcl_sounds.node_sound_stone_defaults()
+    },
+    ["stone"] = {
+        _mcl_blast_resistance = 6,
+        _mcl_hardness = 1.5,
+        groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
+        sounds = mcl_sounds.node_sound_stone_defaults()
+    },
+    ["tuff"] = {
+        _mcl_blast_resistance = 6,
+        _mcl_hardness = 1.5,
+        groups = {natural_blocks = 1, pickaxey = 1, stonecuttable = 1},
+        sounds = mcl_sounds.node_sound_stone_defaults()
+    }
+}
+
+for identifier, definitions in pairs(blocks) do
+    voxelibre.register_block(identifier, definitions)
+end
diff --git a/textures/default_stone.png b/textures/default_stone.png
deleted file mode 100644
index 9e9145af9..000000000
Binary files a/textures/default_stone.png and /dev/null differ
diff --git a/textures/mcl_core_andesite.png b/textures/mcl_core_andesite.png
deleted file mode 100644
index cdb1fa690..000000000
Binary files a/textures/mcl_core_andesite.png and /dev/null differ
diff --git a/textures/mcl_core_diorite.png b/textures/mcl_core_diorite.png
deleted file mode 100644
index 554299612..000000000
Binary files a/textures/mcl_core_diorite.png and /dev/null differ
diff --git a/textures/mcl_core_granite.png b/textures/mcl_core_granite.png
deleted file mode 100644
index 23c65f368..000000000
Binary files a/textures/mcl_core_granite.png and /dev/null differ
diff --git a/textures/mcl_core_granite_smooth.png b/textures/mcl_core_granite_smooth.png
deleted file mode 100644
index 003aa8371..000000000
Binary files a/textures/mcl_core_granite_smooth.png and /dev/null differ
diff --git a/textures/mcl_core_stonebrick_carved.png b/textures/mcl_core_stonebrick_carved.png
deleted file mode 100644
index d4891ded2..000000000
Binary files a/textures/mcl_core_stonebrick_carved.png and /dev/null differ
diff --git a/textures/mcl_core_stonebrick_cracked.png b/textures/mcl_core_stonebrick_cracked.png
deleted file mode 100644
index b340de08f..000000000
Binary files a/textures/mcl_core_stonebrick_cracked.png and /dev/null differ
diff --git a/textures/mcl_core_stonebrick_mossy.png b/textures/mcl_core_stonebrick_mossy.png
deleted file mode 100644
index c0d82c50d..000000000
Binary files a/textures/mcl_core_stonebrick_mossy.png and /dev/null differ
diff --git a/textures/mcl_deepslate_tuff.png b/textures/mcl_deepslate_tuff.png
deleted file mode 100644
index 40c0fc9d9..000000000
Binary files a/textures/mcl_deepslate_tuff.png and /dev/null differ
diff --git a/textures/natural/natural_andesite.png b/textures/natural/natural_andesite.png
new file mode 100644
index 000000000..19a5df325
Binary files /dev/null and b/textures/natural/natural_andesite.png differ
diff --git a/textures/natural/natural_diorite.png b/textures/natural/natural_diorite.png
new file mode 100644
index 000000000..b5d10d9ef
Binary files /dev/null and b/textures/natural/natural_diorite.png differ
diff --git a/textures/natural/natural_granite.png b/textures/natural/natural_granite.png
new file mode 100644
index 000000000..25881c470
Binary files /dev/null and b/textures/natural/natural_granite.png differ
diff --git a/textures/natural/natural_stone.png b/textures/natural/natural_stone.png
new file mode 100644
index 000000000..4f3667d28
Binary files /dev/null and b/textures/natural/natural_stone.png differ
diff --git a/textures/natural/natural_tuff.png b/textures/natural/natural_tuff.png
new file mode 100644
index 000000000..1a06781c1
Binary files /dev/null and b/textures/natural/natural_tuff.png differ