diff --git a/homedecor_common/materials.lua b/homedecor_common/materials.lua
index d7defd94..771381f8 100644
--- a/homedecor_common/materials.lua
+++ b/homedecor_common/materials.lua
@@ -18,6 +18,7 @@ homedecor.materials = {
     dye_green = "dye:green",
     dye_red = "dye:red",
     dye_yellow = "dye:yellow",
+    dye_brown = "dye:brown",
     silicon = "mesecons_materials:silicon",
     string = "farming:string",
     paper = "default:paper",
@@ -31,6 +32,7 @@ homedecor.materials = {
     slab_stone = "stairs:slab_stone",
     slab_wood = "stairs:slab_wood",
     glass_block = "default_glass",
+    glass_bottle = "vessels:glass_bottle",
 }
 
 if minetest.get_modpath("moreores") then
@@ -76,6 +78,7 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
         dye_green = "fl_dyes:green_dye",
         dye_red = "fl_dyes:red_dye",
         dye_yellow = "fl_dyes:yellow_dye",
+        dye_brown = "fl_dyes:brown_dye",
         copper_ingot = "fl_ores:copper_ingot",
         tin_ingot = "fl_ores:tin_ingot",
         silver_ingot = "fl_ores:iron_ingot",
@@ -85,7 +88,8 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
         iron_lump = "fl_ores:iron_ore",
         slab_stone = "fl_stone:stone_slab",
         slab_wood = "fl_trees:apple_plank_slab",
-        glass_block = "fl_glass:framed_glass"
+        glass_block = "fl_glass:framed_glass",
+        glass_bottle = "fl_bottles:bottle",
     }
 elseif minetest.get_modpath("hades_core") then
     homedecor.materials = {
diff --git a/homedecor_gastronomy/.luacheckrc b/homedecor_gastronomy/.luacheckrc
deleted file mode 100644
index 24ea4f8c..00000000
--- a/homedecor_gastronomy/.luacheckrc
+++ /dev/null
@@ -1,22 +0,0 @@
-unused_args = false
-allow_defined_top = true
-max_comment_line_length = 999
-
-read_globals = {
-	"DIR_DELIM",
-	"minetest", "core",
-	"unpack",
-	"dump",
-	table = { fields = { "copy", "getn" } },
-	"vector", "nodeupdate",
-	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
-	"creative",
-	"default",
-	"homedecor",
-	"screwdriver",
-}
-
-globals = {
-}
-
diff --git a/homedecor_gastronomy/init.lua b/homedecor_gastronomy/init.lua
index b71676b3..8d63dd7c 100644
--- a/homedecor_gastronomy/init.lua
+++ b/homedecor_gastronomy/init.lua
@@ -14,10 +14,12 @@ homedecor.register("cutlery_set", {
 	tiles = { "homedecor_cutlery_set.png"	},
 	inventory_image = "homedecor_cutlery_set_inv.png",
 	description = S("Cutlery set"),
-	groups = {snappy=3},
+	groups = {snappy=3, dig_stone=3},
 	selection_box = cutlery_cbox,
 	walkable = false,
-	sounds = default.node_sound_glass_defaults(),
+	_sound_def = {
+		key = "node_sound_glass_defaults",
+	},
 })
 
 local bottle_cbox = {
@@ -49,8 +51,10 @@ for _, b in ipairs(bottle_colors) do
 		description = desc,
 		mesh = "homedecor_bottle.obj",
 		walkable = false,
-		groups = {snappy=3},
-		sounds = default.node_sound_glass_defaults(),
+		groups = {snappy=3, dig_stone=3},
+		_sound_def = {
+			key = "node_sound_glass_defaults",
+		},
 		selection_box = bottle_cbox
 	})
 
@@ -65,8 +69,10 @@ for _, b in ipairs(bottle_colors) do
 		description = desc4,
 		mesh = "homedecor_4_bottles.obj",
 		walkable = false,
-		groups = {snappy=3},
-		sounds = default.node_sound_glass_defaults(),
+		groups = {snappy=3, dig_stone=3},
+		_sound_def = {
+			key = "node_sound_glass_defaults",
+		},
 		selection_box = fbottle_cbox
 	})
 end
@@ -79,9 +85,11 @@ homedecor.register("4_bottles_multi", {
 	inventory_image = "homedecor_4_bottles_multi_inv.png",
 	description = S("Four misc brown/green bottles"),
 	mesh = "homedecor_4_bottles.obj",
-	groups = {snappy=3},
+	groups = {snappy=3, dig_stone=3},
 	walkable = false,
-	sounds = default.node_sound_glass_defaults(),
+	_sound_def = {
+		key = "node_sound_glass_defaults",
+	},
 	selection_box = fbottle_cbox
 })
 
@@ -97,10 +105,12 @@ homedecor.register("wine_rack", {
 		"homedecor_bottle_brown4.png"
 	},
 	inventory_image = "homedecor_wine_rack_inv.png",
-	groups = {choppy=2},
+	groups = {choppy=2, dig_tree=2},
 	selection_box = wine_cbox,
 	collision_box = wine_cbox,
-	sounds = default.node_sound_defaults(),
+	_sound_def = {
+		key = "node_sound_defaults",
+	},
 })
 
 -- coffee!
@@ -125,10 +135,19 @@ homedecor.register("coffee_maker", {
 	description = S("Coffee Maker"),
 	inventory_image = "homedecor_coffeemaker_inv.png",
 	walkable = false,
-	groups = {snappy=3},
+	groups = {snappy=3, dig_stone=3},
 	selection_box = cm_cbox,
 	node_box = cm_cbox,
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil,
+	crafts = {
+		{
+			recipe = {
+				{"basic_materials:plastic_sheet", "bucket:bucket_water", "basic_materials:plastic_sheet"},
+				{"basic_materials:plastic_sheet", "glass_block", "basic_materials:plastic_sheet"},
+				{"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"}
+			},
+		}
+	}
 })
 
 homedecor.register("toaster", {
@@ -137,7 +156,7 @@ homedecor.register("toaster", {
 	inventory_image = "homedecor_toaster_inv.png",
 	walkable = false,
 	use_texture_alpha = "clip",
-	groups = { snappy=3 },
+	groups = { snappy=3, dig_stone=3 },
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -153,7 +172,15 @@ homedecor.register("toaster", {
 			max_hear_distance = 5
 		})
 		return itemstack
-	end
+	end,
+	crafts = {
+		{
+			recipe = {
+				{ "steel_ingot", "basic_materials:heating_element", "steel_ingot" },
+				{ "steel_ingot", "basic_materials:heating_element", "steel_ingot" }
+			},
+		}
+	}
 })
 
 homedecor.register("toaster_loaf", {
@@ -167,7 +194,7 @@ homedecor.register("toaster_loaf", {
 	},
 	walkable = false,
 	use_texture_alpha = "clip",
-	groups = { snappy=3, not_in_creative_inventory=1 },
+	groups = { snappy=3, not_in_creative_inventory=1, dig_stone=3 },
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -226,35 +253,17 @@ minetest.register_abm({
 minetest.register_craft( {
         output = "homedecor:bottle_green",
         recipe = {
-			{ "vessels:glass_bottle", "dye:green" }
+			{ homedecor.materials["glass_bottle"], homedecor.materials["dye_green"] }
         },
 })
 
 minetest.register_craft( {
         output = "homedecor:bottle_brown",
         recipe = {
-			{ "vessels:glass_bottle", "dye:brown" }
+			{ homedecor.materials["glass_bottle"], homedecor.materials["dye_brown"] }
         },
 })
 
-minetest.register_craft({
-	output = "homedecor:coffee_maker",
-	recipe = {
-	    {"basic_materials:plastic_sheet", "bucket:bucket_water", "basic_materials:plastic_sheet"},
-	    {"basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet"},
-	    {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"}
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:toaster",
-	recipe = {
-		{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" },
-		{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }
-	},
-})
-
-
 minetest.register_craft({
 	type = "shapeless",
 	output = "homedecor:4_bottles_brown",
diff --git a/homedecor_gastronomy/mod.conf b/homedecor_gastronomy/mod.conf
index b81ba2a7..c8622152 100644
--- a/homedecor_gastronomy/mod.conf
+++ b/homedecor_gastronomy/mod.conf
@@ -1,4 +1,4 @@
 name = homedecor_gastronomy
 description = Homedecor mod: gastronomy
-depends = homedecor_common, default, basic_materials, dye, creative
+depends = homedecor_common
 optional_depends = bucket, screwdriver