diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua
index 0448a812..f62d69ff 100644
--- a/homedecor_kitchen/init.lua
+++ b/homedecor_kitchen/init.lua
@@ -605,44 +605,56 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_colorable_steel",
-        recipe = {
+	output = "homedecor:kitchen_cabinet_colorable_with_drawers",
+	recipe = {
+		{"homedecor:kitchen_cabinet_colorable", },
+	}
+})
+
+
+local cabinet_types = { "homedecor:kitchen_cabinet_colorable", "homedecor:kitchen_cabinet_colorable_with_drawers" }
+
+for _, cabinet in ipairs(cabinet_types) do
+	minetest.register_craft({
+		output = cabinet.."_steel",
+		recipe = {
 			{homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot},
-			{"", "homedecor:kitchen_cabinet_colorable", ""},
-	}
-})
+			{"", cabinet, ""},
+		}
+	})
 
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_colorable_steel",
-        recipe = {
+	minetest.register_craft({
+		output = cabinet.."_steel",
+		recipe = {
 			{"moreblocks:slab_steelblock_1"},
-			{ "homedecor:kitchen_cabinet_colorable" },
-	}
-})
+			{cabinet},
+		}
+	})
 
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_colorable_marble",
-        recipe = {
+	minetest.register_craft({
+		output = cabinet.."_marble",
+		recipe = {
 			{"building_blocks:slab_marble"},
-			{"homedecor:kitchen_cabinet_colorable"},
-	}
-})
+			{cabinet},
+		}
+	})
 
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_colorable_marble",
-        recipe = {
+	minetest.register_craft({
+		output = cabinet.."_marble",
+		recipe = {
 			{"technic:slab_marble_1"},
-			{"homedecor:kitchen_cabinet_colorable"},
-	}
-})
+			{cabinet},
+		}
+	})
 
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_colorable_granite",
-        recipe = {
+	minetest.register_craft({
+		output = cabinet.."_granite",
+		recipe = {
 			{"technic:slab_granite_1"},
-			{"homedecor:kitchen_cabinet_colorable"},
-	}
-})
+			{cabinet},
+		}
+	})
+end
 
 minetest.register_craft({
 	type = "shapeless",
diff --git a/homedecor_tables/misc.lua b/homedecor_tables/misc.lua
index 193fc1d1..f69589a8 100644
--- a/homedecor_tables/misc.lua
+++ b/homedecor_tables/misc.lua
@@ -126,7 +126,7 @@ for i, mat in ipairs(tabletop_materials) do
 		end
 	end
 
-	minetest.register_alias('homedecor:'..m..'_table_large_b', 'homedecor:'..m..'_table_large')
+	minetest.register_alias('homedecor:'..m..'_table_large_square_b', 'homedecor:'..m..'_table_large_square')
 	minetest.register_alias('homedecor:'..m..'_table_small_square_b', 'homedecor:'..m..'_table_small_square')
 	minetest.register_alias('homedecor:'..m..'_table_small_round_b', 'homedecor:'..m..'_table_small_round')
 	minetest.register_alias('homedecor:'..m..'_table_large', 'homedecor:'..m..'_table_large_square')
@@ -187,7 +187,7 @@ minetest.register_craft( {
 })
 
 minetest.register_craft( {
-        output = "homedecor:glass_table_large_b 2",
+        output = "homedecor:glass_table_large_square_b 2",
         recipe = {
 		{ "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" },
 	}
@@ -210,7 +210,7 @@ minetest.register_craft( {
 })
 
 minetest.register_craft( {
-        output = "homedecor:wood_table_large_b 2",
+        output = "homedecor:wood_table_large_square_b 2",
         recipe = {
 		{ "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" },
 	}