diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua
index 382687ca..d0b287c8 100644
--- a/homedecor/bathroom_sanitation.lua
+++ b/homedecor/bathroom_sanitation.lua
@@ -12,7 +12,7 @@ homedecor.register("toilet", {
 		"homedecor_marble_light.png",
 		"homedecor_marble_light.png",
 		"homedecor_marble_light.png",
-		"forniture_metal.png"
+		"homedecor_generic_metal_neutral.png"
 	},
 	selection_box = toilet_cbox,
 	collision_box = toilet_cbox,
@@ -31,7 +31,7 @@ homedecor.register("toilet_open", {
 		"homedecor_marble_light.png",
 		"homedecor_marble_light.png",
 		"default_water.png",
-		"forniture_metal.png"
+		"homedecor_generic_metal_neutral.png"
 	},
 	selection_box = toilet_cbox,
 	collision_box = toilet_cbox,
@@ -99,10 +99,10 @@ homedecor.register("taps", {
 	description = S("Bathroom taps/faucet"),
 	mesh = "homedecor_bathroom_faucet.obj",
 	tiles = {
-		"forniture_metal.png",
-		"homedecor_bright_metal.png",
-		"homedecor_white_metal.png",
-		"homedecor_bright_metal.png"
+		"homedecor_generic_metal_neutral.png",
+		"homedecor_generic_metal_bright.png",
+		"homedecor_generic_metal_white.png",
+		"homedecor_generic_metal_bright.png"
 	},
 	inventory_image = "3dforniture_taps_inv.png",
 	wield_image = "3dforniture_taps_inv.png",
@@ -120,10 +120,10 @@ homedecor.register("taps_brass", {
 	description = S("Bathroom taps/faucet (brass)"),
 	mesh = "homedecor_bathroom_faucet.obj",
 	tiles = {
-		"homedecor_tile_brass.png",
-		"homedecor_tile_brass.png",
-		"homedecor_white_metal.png",
-		"homedecor_tile_brass.png"
+		"homedecor_generic_metal_brass.png",
+		"homedecor_generic_metal_brass.png",
+		"homedecor_generic_metal_white.png",
+		"homedecor_generic_metal_brass.png"
 	},
 	inventory_image = "3dforniture_taps_brass_inv.png",
 	wield_image = "3dforniture_taps_brass_inv.png",
diff --git a/homedecor/climate-control.lua b/homedecor/climate-control.lua
index d2a10c5f..6f480052 100644
--- a/homedecor/climate-control.lua
+++ b/homedecor/climate-control.lua
@@ -161,7 +161,7 @@ local r_cbox = {
 homedecor.register("radiator", {
 	mesh = "homedecor_radiator.obj",
 	tiles = {
-		"homedecor_white_metal.png",
+		"homedecor_generic_metal_white.png",
 		"homedecor_radiator_controls.png"
 	},
 	inventory_image = "homedecor_radiator_inv.png",
diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua
index cbb56fc1..7254959a 100644
--- a/homedecor/clocks.lua
+++ b/homedecor/clocks.lua
@@ -79,9 +79,9 @@ homedecor.register("grandfather_clock", {
 	tiles = {
 		"default_glass.png",
 		"homedecor_grandfather_clock_face.png",
-		"homedecor_grandfather_clock_wood.png",
+		"homedecor_generic_wood_luxury_brown1.png",
 		"homedecor_grandfather_clock_face_edge.png",
-		"homedecor_tile_brass.png"
+		"homedecor_generic_metal_brass.png"
 	},
 	inventory_image = "homedecor_grandfather_clock_inv.png",
 	groups = { snappy = 3 },
diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua
index 5b0e4431..fb0201fd 100644
--- a/homedecor/doors_and_gates.lua
+++ b/homedecor/doors_and_gates.lua
@@ -497,7 +497,7 @@ minetest.register_node("homedecor:japanese_wall_top", {
 	drawtype = "mesh",
 	mesh = "homedecor_wall_japanese_top.obj",
 	tiles = {
-		"homedecor_japanese_wood.png",
+		"homedecor_generic_wood_luxury_brown2.png",
 		"homedecor_japanese_paper.png"
 	},
 	paramtype = "light",
@@ -512,7 +512,7 @@ minetest.register_node("homedecor:japanese_wall_middle", {
 	drawtype = "mesh",
 	mesh = "homedecor_wall_japanese_middle.obj",
 	tiles = {
-		"homedecor_japanese_wood.png",
+		"homedecor_generic_wood_luxury_brown2.png",
 		"homedecor_japanese_paper.png"
 	},
 	paramtype = "light",
@@ -527,7 +527,7 @@ minetest.register_node("homedecor:japanese_wall_bottom", {
 	drawtype = "mesh",
 	mesh = "homedecor_wall_japanese_bottom.obj",
 	tiles = {
-		"homedecor_japanese_wood.png",
+		"homedecor_generic_wood_luxury_brown2.png",
 		"homedecor_japanese_paper.png"
 	},
 	paramtype = "light",
@@ -562,7 +562,7 @@ homedecor.register("door_japanese_closed", {
 	description = "Japanese-style door",
 	inventory_image = "homedecor_door_japanese_inv.png",
 	tiles = {
-		"homedecor_japanese_wood.png",
+		"homedecor_generic_wood_luxury_brown2.png",
 		"homedecor_japanese_paper.png"
 	},
 	mesh = "homedecor_door_japanese_closed.obj",
@@ -583,7 +583,7 @@ homedecor.register("door_japanese_closed", {
 
 minetest.register_node("homedecor:door_japanese_open", {
 	tiles = {
-		"homedecor_japanese_wood.png",
+		"homedecor_generic_wood_luxury_brown2.png",
 		"homedecor_japanese_paper.png"
 	},
 	drawtype = "mesh",
diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua
index 2a2d170c..d98ed53e 100644
--- a/homedecor/electronics.lua
+++ b/homedecor/electronics.lua
@@ -23,7 +23,7 @@ homedecor.register("speaker_open", {
 		"homedecor_speaker_sides.png",
 		"homedecor_speaker_driver.png",
 		"homedecor_speaker_open_front.png",
-		"forniture_black_metal.png"
+		"homedecor_generic_metal_black.png"
 	},
 	groups = { snappy = 3 },
 	sounds = default.node_sound_leaves_defaults(),
diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua
index 337bbf4b..4d7e6040 100644
--- a/homedecor/exterior.lua
+++ b/homedecor/exterior.lua
@@ -10,7 +10,7 @@ homedecor.register("barbecue", {
 	description = "Barbecue",
 	mesh = "homedecor_barbecue.obj",
 	tiles = {
-		"forniture_black_metal.png",
+		"homedecor_generic_metal_black.png",
 		{	name="homedecor_embers.png",
 			animation={
 				type="vertical_frames",
@@ -38,8 +38,8 @@ local bl1_cbox = {
 homedecor.register("bench_large_1", {
 	mesh = "homedecor_bench_large_1.obj",
 	tiles = {
-		"homedecor_generic_wood.png",
-		"homedecor_tile_wrought_iron.png"
+		"homedecor_generic_wood_neutral.png",
+		"homedecor_generic_metal_wrought_iron.png"
 	},
 	description = "Garden Bench (style 1)",
 	inventory_image = "homedecor_bench_large_1_inv.png",
@@ -61,7 +61,7 @@ local bl2_cbox = {
 homedecor.register("bench_large_2", {
 	description = "Garden Bench (style 2)",
 	mesh = "homedecor_bench_large_2.obj",
-	tiles = { "homedecor_generic_wood.png" },
+	tiles = { "homedecor_generic_wood_neutral.png" },
 	inventory_image = "homedecor_bench_large_2_inv.png",
 	groups = {snappy=3},
 	selection_box = bl2_cbox,
@@ -127,7 +127,7 @@ minetest.register_alias("homedecor:doghouse_roof", "air")
 minetest.register_alias("homedecor:doghouse_base", "homedecor:doghouse")
 
 homedecor.register("simple_bench", {
-	tiles = { "homedecor_generic_wood.png" },
+	tiles = { "homedecor_generic_wood_neutral.png" },
 	description = "Simple Bench",
 	groups = {snappy=3},
 	node_box = {
@@ -263,7 +263,7 @@ homedecor.register("well", {
 	mesh = "homedecor_well.obj",
 	tiles = {
 		"homedecor_rope_texture.png",
-		"forniture_metal.png",
+		"homedecor_generic_metal_neutral.png",
 		"default_water.png",
 		"default_cobble.png",
 		"default_wood.png",
diff --git a/homedecor/fences.lua b/homedecor/fences.lua
index ce48a7fa..29cae658 100644
--- a/homedecor/fences.lua
+++ b/homedecor/fences.lua
@@ -22,7 +22,7 @@ for _, m in ipairs(materials) do
 homedecor.register("fence_"..m, {
 	description = S("Fence/railing ("..m..")"),
 	drawtype = "fencelike",
-	tiles = {"homedecor_tile_"..m..".png"},
+	tiles = {"homedecor_generic_metal_"..m..".png"},
 	inventory_image = "homedecor_fence_"..m..".png",
 	selection_box = homedecor.nodebox.bar_y(1/7),
 	groups = {snappy=3},
diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua
index b33b0d34..0a07cbac 100644
--- a/homedecor/furniture.lua
+++ b/homedecor/furniture.lua
@@ -48,16 +48,18 @@ local table_colors = { "", "mahogany", "white" }
 
 for _, i in ipairs(table_colors) do
 	local color = "_"..i
+	local color2 = "_"..i
 	local desc = S("Table ("..i..")")
 
 	if i == "" then
 		color = ""
+		color2 = "_beech"
 		desc = S("Table")
 	end
 
 	homedecor.register("table"..color, {
 		description = desc,
-		tiles = { "forniture_wood"..color..".png" },
+		tiles = { "homedecor_generic_wood"..color2..".png" },
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -97,15 +99,15 @@ for i in ipairs(chaircolors) do
 	local color2 = chaircolors[i][1]
 	local name = S(chaircolors[i][2])
 	local chairtiles = {
-		"forniture_wood.png",
+		"homedecor_generic_wood_beech.png",
 		"wool"..color..".png",
 	}
 
 	if chaircolors[i][1] == "" then
 		color = ""
 		chairtiles = {
-			"forniture_wood.png",
-			"forniture_wood.png"
+			"homedecor_generic_wood_beech.png",
+			"homedecor_generic_wood_beech.png"
 		}
 	end
 
@@ -320,7 +322,7 @@ local wd_cbox = {
 homedecor.register("wardrobe_bottom", {
 	mesh = "homedecor_bedroom_wardrobe.obj",
 	tiles = {
-		"forniture_wood.png",
+		"homedecor_generic_wood_beech.png",
 		"homedecor_wardrobe_drawers.png",
 		"homedecor_wardrobe_doors.png"
 	},
diff --git a/homedecor/furniture_medieval.lua b/homedecor/furniture_medieval.lua
index 9b8c8197..a080baa2 100644
--- a/homedecor/furniture_medieval.lua
+++ b/homedecor/furniture_medieval.lua
@@ -3,7 +3,7 @@ local S = homedecor.gettext
 
 homedecor.register("bars", {
 	description = S("Bars"),
-	tiles = { "forniture_black_metal.png" },
+	tiles = { "homedecor_generic_metal_black.png" },
 	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
@@ -25,7 +25,7 @@ homedecor.register("bars", {
 --L Binding Bars
 homedecor.register("L_binding_bars", {
 	description = S("Binding Bars"),
-	tiles = { "forniture_black_metal.png" },
+	tiles = { "homedecor_generic_metal_black.png" },
 	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
@@ -50,7 +50,7 @@ local chain_cbox = {
 homedecor.register("chains", {
 	description = S("Chains"),
 	mesh = "forniture_chains.obj",
-	tiles = { "forniture_black_metal.png" },
+	tiles = { "homedecor_generic_metal_black.png" },
 	inventory_image="forniture_chains_inv.png",
 	sunlight_propagates = true,
 	selection_box = chain_cbox,
@@ -71,8 +71,8 @@ homedecor.register("torch_wall", {
 				length=1.0,
 			},
 		},
-		"forniture_black_metal.png",
-		"forniture_metal.png",
+		"homedecor_generic_metal_black.png",
+		"homedecor_generic_metal_neutral.png",
 		"forniture_coal.png",
 	},
 	inventory_image="forniture_torch_inv.png",
diff --git a/homedecor/kitchen_furniture.lua b/homedecor/kitchen_furniture.lua
index b76f63b5..b66e52a6 100644
--- a/homedecor/kitchen_furniture.lua
+++ b/homedecor/kitchen_furniture.lua
@@ -90,7 +90,7 @@ local kf_cbox = {
 
 homedecor.register("kitchen_faucet", {
 	mesh = "homedecor_kitchen_faucet.obj",
-	tiles = { "homedecor_bright_metal.png" },
+	tiles = { "homedecor_generic_metal_bright.png" },
 	inventory_image = "homedecor_kitchen_faucet_inv.png",
 	description = "Kitchen Faucet",
 	groups = {snappy=3},
diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua
index 587b4177..e5877d76 100644
--- a/homedecor/lighting.lua
+++ b/homedecor/lighting.lua
@@ -205,7 +205,7 @@ homedecor.register("candlestick_wrought_iron", {
 	tiles = {
 		"homedecor_candle_sides.png",
 		{name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}},
-		"homedecor_tile_wrought_iron.png",
+		"homedecor_generic_metal_wrought_iron.png",
 	},
 	inventory_image = "homedecor_candlestick_wrought_iron_inv.png",
 	selection_box = cs_cbox,
@@ -222,7 +222,7 @@ homedecor.register("candlestick_brass", {
 	tiles = {
 		"homedecor_candle_sides.png",
 		{name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}},
-		"homedecor_tile_brass.png",
+		"homedecor_generic_metal_brass.png",
 	},
 	inventory_image = "homedecor_candlestick_brass_inv.png",
 	selection_box = cs_cbox,
@@ -240,7 +240,7 @@ homedecor.register("wall_sconce", {
 		'homedecor_candle_sides.png',
 		{name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}},
 		'homedecor_wall_sconce_back.png',
-		'homedecor_tile_wrought_iron.png',
+		'homedecor_generic_metal_wrought_iron.png',
 	},
 	inventory_image = "homedecor_wall_sconce_inv.png",
 	selection_box = {
@@ -266,7 +266,7 @@ homedecor.register("oil_lamp", {
 	tiles = {
 		"homedecor_oil_lamp_handles.png",
 		"homedecor_oil_lamp_glass.png",
-		"homedecor_tile_brass.png",
+		"homedecor_generic_metal_brass.png",
 		"homedecor_oil_lamp_base.png",
 		"homedecor_oil_lamp_top.png",
 	},
@@ -403,8 +403,8 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
 		tiles = {
 			"wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten,
 			"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten,
-			"homedecor_table_standing_lamp_wood.png",
-			"forniture_metal.png",
+			"homedecor_generic_wood_red.png",
+			"homedecor_generic_metal_neutral.png",
 		},
 		inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png",
 		walkable = false,
@@ -429,8 +429,8 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
 		tiles = {
 			"wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten,
 			"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten,
-			"homedecor_table_standing_lamp_wood.png",
-			"forniture_metal.png",
+			"homedecor_generic_wood_red.png",
+			"homedecor_generic_metal_neutral.png",
 		},
 		inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png",
 		walkable = false,
@@ -488,10 +488,10 @@ homedecor.register("ceiling_lamp", {
 	description = S("Ceiling Lamp"),
 	mesh = "homedecor_ceiling_lamp.obj",
 	tiles = {
-		"homedecor_tile_brass.png",
+		"homedecor_generic_metal_brass.png",
 		"homedecor_ceiling_lamp_glass.png",
 		"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200",
-		"homedecor_generic_brown_plastic.png",
+		"homedecor_generic_plastic_brown.png",
 	},
 	inventory_image = "homedecor_ceiling_lamp_inv.png",
 	light_source = LIGHT_MAX,
@@ -505,10 +505,10 @@ homedecor.register("ceiling_lamp_off", {
 	description = S("Ceiling Lamp (off)"),
 	mesh = "homedecor_ceiling_lamp.obj",
 	tiles = {
-		"homedecor_tile_brass.png",
+		"homedecor_generic_metal_brass.png",
 		"homedecor_ceiling_lamp_glass.png",
 		"homedecor_table_standing_lamp_lightbulb.png",
-		"homedecor_generic_brown_plastic.png",
+		"homedecor_generic_plastic_brown.png",
 	},
 	groups = {snappy=3, not_in_creative_inventory=1},
 	on_punch = function(pos, node, puncher)
diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua
index c825dfe2..7e1862f6 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor/misc-nodes.lua
@@ -62,7 +62,7 @@ end
 homedecor.register("pole_brass", {
     description = S("Brass Pole"),
 	mesh = "homedecor_round_pole.obj",
-    tiles = {"homedecor_tile_brass.png^homedecor_tile_horizlines_overlay.png",},
+    tiles = {"homedecor_generic_metal_brass.png^homedecor_generic_metal_lines_overlay.png",},
     inventory_image = "homedecor_pole_brass_inv.png",
     wield_image = "homedecor_pole_brass_inv.png",
     selection_box = {
@@ -79,7 +79,7 @@ homedecor.register("pole_brass", {
 
 homedecor.register("pole_wrought_iron", {
     description = S("Wrought Iron Pole"),
-    tiles = { "homedecor_tile_wrought_iron.png^homedecor_tile_horizlines_overlay.png" },
+    tiles = { "homedecor_generic_metal_wrought_iron.png^homedecor_generic_metal_lines_overlay.png" },
     inventory_image = "homedecor_pole_wrought_iron_inv.png",
     wield_image = "homedecor_pole_wrought_iron_inv.png",
     selection_box = {
@@ -251,7 +251,7 @@ homedecor.register("filing_cabinet", {
 	description = S("Filing Cabinet"),
 	mesh = "homedecor_filing_cabinet.obj",
 	tiles = {
-		"forniture_wood.png",
+		"homedecor_generic_wood_beech.png",
 		"homedecor_filing_cabinet_front.png",
 		"homedecor_filing_cabinet_bottom.png"
 	},
@@ -275,7 +275,7 @@ homedecor.register("pool_table", {
 		"homedecor_pool_table_baize.png",
 		"homedecor_pool_table_pockets.png",
 		"homedecor_pool_table_balls.png",
-		"homedecor_pool_table_wood.png"
+		"homedecor_generic_wood_luxury_brown3.png"
 	},
 	description = "Pool Table",
 	inventory_image = "homedecor_pool_table_inv.png",
@@ -288,7 +288,7 @@ homedecor.register("pool_table", {
 minetest.register_alias("homedecor:pool_table_2", "air")
 
 homedecor.register("coatrack_wallmount", {
-	tiles = { "forniture_wood.png" },
+	tiles = { "homedecor_generic_wood_beech.png" },
 	inventory_image = "homedecor_coatrack_wallmount_inv.png",
 	description = "Coatrack (wallmounted)",
         groups = {snappy=3},
@@ -311,8 +311,8 @@ homedecor.register("coatrack_wallmount", {
 homedecor.register("coat_tree", {
 	mesh = "homedecor_coatrack.obj",
 	tiles = {
-		"forniture_wood.png",
-		"homedecor_generic_wood.png"
+		"homedecor_generic_wood_beech.png",
+		"homedecor_generic_wood_neutral.png"
 	},
 	inventory_image = "homedecor_coatrack_inv.png",
 	description = "Coat tree",
@@ -437,8 +437,8 @@ homedecor.register("piano", {
 	mesh = "homedecor_piano.obj",
 	tiles = {
 		"homedecor_piano_keys.png",
-		"homedecor_tile_brass.png",
-		"homedecor_piano_wood.png"
+		"homedecor_generic_metal_brass.png",
+		"homedecor_generic_wood_luxury_black.png"
 	},
 	inventory_image = "homedecor_piano_inv.png",
 	description = "Piano",
@@ -461,7 +461,7 @@ homedecor.register("trophy", {
 	mesh = "homedecor_trophy.obj",
 	tiles = {
 		"default_wood.png",
-		"homedecor_tile_gold.png"
+		"homedecor_generic_metal_gold.png"
 	},
 	inventory_image = "homedecor_trophy_inv.png",
 	groups = { snappy=3 },
@@ -478,9 +478,9 @@ homedecor.register("sportbench", {
 	description = "Sport bench",
 	mesh = "homedecor_sport_bench.obj",
 	tiles = {
-		"homedecor_tile_wrought_iron.png",
-		"homedecor_bright_metal.png",
-		"forniture_black_metal.png",
+		"homedecor_generic_metal_wrought_iron.png",
+		"homedecor_generic_metal_bright.png",
+		"homedecor_generic_metal_black.png",
 		"wool_black.png"
 	},
 	inventory_image = "homedecor_sport_bench_inv.png",
@@ -576,11 +576,11 @@ homedecor.register("tool_cabinet", {
 	description = "Metal tool cabinet and work table",
 	mesh = "homedecor_tool_cabinet.obj",
 	tiles = {
-		"homedecor_red_metal.png",
+		"homedecor_generic_metal_red.png",
 		"homedecor_tool_cabinet_drawers.png",
-		"homedecor_green_metal.png",
-		"forniture_metal.png",
-		"homedecor_bright_metal.png",
+		"homedecor_generic_metal_green.png",
+		"homedecor_generic_metal_neutral.png",
+		"homedecor_generic_metal_bright.png",
 		"homedecor_tool_cabinet_misc.png",
 	},
 	inventory_image = "homedecor_tool_cabinet_inv.png",
@@ -684,8 +684,8 @@ homedecor.banister_materials = {
 	},
 	{	"white_dark",
 		"dark topped",
-		"homedecor_white_wood.png",
-		"homedecor_dark_wood.png",
+		"homedecor_generic_wood_white.png",
+		"homedecor_generic_wood_dark.png",
 		"group:wood",
 		"group:stick",
 		"dye:brown",
@@ -693,8 +693,8 @@ homedecor.banister_materials = {
 	},
 	{	"brass",
 		"brass",
-		"homedecor_white_wood.png",
-		"homedecor_tile_brass.png",
+		"homedecor_generic_wood_white.png",
+		"homedecor_generic_metal_brass.png",
 		"technic:brass_ingot",
 		"group:stick",
 		"",
@@ -702,8 +702,8 @@ homedecor.banister_materials = {
 	},
 	{	"wrought_iron",
 		"wrought iron",
-		"homedecor_tile_wrought_iron.png",
-		"homedecor_tile_wrought_iron.png",
+		"homedecor_generic_metal_wrought_iron.png",
+		"homedecor_generic_metal_wrought_iron.png",
 		"homedecor:pole_wrought_iron",
 		"homedecor:pole_wrought_iron",
 		"",
diff --git a/homedecor/tables.lua b/homedecor/tables.lua
index ca0986b1..68aa343b 100644
--- a/homedecor/tables.lua
+++ b/homedecor/tables.lua
@@ -201,9 +201,9 @@ homedecor.register("desk", {
 	description = "Desk",
 	mesh = "homedecor_desk.obj",
 	tiles = {
-		"forniture_wood.png",
+		"homedecor_generic_wood_beech.png",
 		"homedecor_desk_drawers.png",
-		"forniture_black_metal.png",
+		"homedecor_generic_metal_black.png",
 	},
 	inventory_image = "homedecor_desk_inv.png",
 	selection_box = desk_cbox,
diff --git a/homedecor/textures/forniture_black_metal.png b/homedecor/textures/homedecor_generic_metal_black.png
similarity index 100%
rename from homedecor/textures/forniture_black_metal.png
rename to homedecor/textures/homedecor_generic_metal_black.png
diff --git a/homedecor/textures/homedecor_tile_brass.png b/homedecor/textures/homedecor_generic_metal_brass.png
similarity index 100%
rename from homedecor/textures/homedecor_tile_brass.png
rename to homedecor/textures/homedecor_generic_metal_brass.png
diff --git a/homedecor/textures/homedecor_bright_metal.png b/homedecor/textures/homedecor_generic_metal_bright.png
similarity index 100%
rename from homedecor/textures/homedecor_bright_metal.png
rename to homedecor/textures/homedecor_generic_metal_bright.png
diff --git a/homedecor/textures/homedecor_tile_gold.png b/homedecor/textures/homedecor_generic_metal_gold.png
similarity index 100%
rename from homedecor/textures/homedecor_tile_gold.png
rename to homedecor/textures/homedecor_generic_metal_gold.png
diff --git a/homedecor/textures/homedecor_green_metal.png b/homedecor/textures/homedecor_generic_metal_green.png
similarity index 100%
rename from homedecor/textures/homedecor_green_metal.png
rename to homedecor/textures/homedecor_generic_metal_green.png
diff --git a/homedecor/textures/homedecor_tile_horizlines_overlay.png b/homedecor/textures/homedecor_generic_metal_lines_overlay.png
similarity index 100%
rename from homedecor/textures/homedecor_tile_horizlines_overlay.png
rename to homedecor/textures/homedecor_generic_metal_lines_overlay.png
diff --git a/homedecor/textures/forniture_metal.png b/homedecor/textures/homedecor_generic_metal_neutral.png
similarity index 100%
rename from homedecor/textures/forniture_metal.png
rename to homedecor/textures/homedecor_generic_metal_neutral.png
diff --git a/homedecor/textures/homedecor_red_metal.png b/homedecor/textures/homedecor_generic_metal_red.png
similarity index 100%
rename from homedecor/textures/homedecor_red_metal.png
rename to homedecor/textures/homedecor_generic_metal_red.png
diff --git a/homedecor/textures/homedecor_white_metal.png b/homedecor/textures/homedecor_generic_metal_white.png
similarity index 100%
rename from homedecor/textures/homedecor_white_metal.png
rename to homedecor/textures/homedecor_generic_metal_white.png
diff --git a/homedecor/textures/homedecor_tile_wrought_iron.png b/homedecor/textures/homedecor_generic_metal_wrought_iron.png
similarity index 100%
rename from homedecor/textures/homedecor_tile_wrought_iron.png
rename to homedecor/textures/homedecor_generic_metal_wrought_iron.png
diff --git a/homedecor/textures/homedecor_generic_brown_plastic.png b/homedecor/textures/homedecor_generic_plastic_brown.png
similarity index 100%
rename from homedecor/textures/homedecor_generic_brown_plastic.png
rename to homedecor/textures/homedecor_generic_plastic_brown.png
diff --git a/homedecor/textures/forniture_wood.png b/homedecor/textures/homedecor_generic_wood_beech.png
similarity index 100%
rename from homedecor/textures/forniture_wood.png
rename to homedecor/textures/homedecor_generic_wood_beech.png
diff --git a/homedecor/textures/homedecor_dark_wood.png b/homedecor/textures/homedecor_generic_wood_dark.png
similarity index 100%
rename from homedecor/textures/homedecor_dark_wood.png
rename to homedecor/textures/homedecor_generic_wood_dark.png
diff --git a/homedecor/textures/homedecor_piano_wood.png b/homedecor/textures/homedecor_generic_wood_luxury_black.png
similarity index 100%
rename from homedecor/textures/homedecor_piano_wood.png
rename to homedecor/textures/homedecor_generic_wood_luxury_black.png
diff --git a/homedecor/textures/homedecor_grandfather_clock_wood.png b/homedecor/textures/homedecor_generic_wood_luxury_brown1.png
similarity index 100%
rename from homedecor/textures/homedecor_grandfather_clock_wood.png
rename to homedecor/textures/homedecor_generic_wood_luxury_brown1.png
diff --git a/homedecor/textures/homedecor_japanese_wood.png b/homedecor/textures/homedecor_generic_wood_luxury_brown2.png
similarity index 100%
rename from homedecor/textures/homedecor_japanese_wood.png
rename to homedecor/textures/homedecor_generic_wood_luxury_brown2.png
diff --git a/homedecor/textures/homedecor_pool_table_wood.png b/homedecor/textures/homedecor_generic_wood_luxury_brown3.png
similarity index 100%
rename from homedecor/textures/homedecor_pool_table_wood.png
rename to homedecor/textures/homedecor_generic_wood_luxury_brown3.png
diff --git a/homedecor/textures/forniture_wood_mahogany.png b/homedecor/textures/homedecor_generic_wood_mahogany.png
similarity index 100%
rename from homedecor/textures/forniture_wood_mahogany.png
rename to homedecor/textures/homedecor_generic_wood_mahogany.png
diff --git a/homedecor/textures/homedecor_generic_wood.png b/homedecor/textures/homedecor_generic_wood_neutral.png
similarity index 100%
rename from homedecor/textures/homedecor_generic_wood.png
rename to homedecor/textures/homedecor_generic_wood_neutral.png
diff --git a/homedecor/textures/homedecor_generic_wood_red.png b/homedecor/textures/homedecor_generic_wood_red.png
index a33ae3e0..cf844c59 100644
Binary files a/homedecor/textures/homedecor_generic_wood_red.png and b/homedecor/textures/homedecor_generic_wood_red.png differ
diff --git a/homedecor/textures/forniture_wood_white.png b/homedecor/textures/homedecor_generic_wood_white.png
similarity index 100%
rename from homedecor/textures/forniture_wood_white.png
rename to homedecor/textures/homedecor_generic_wood_white.png
diff --git a/homedecor/textures/homedecor_table_standing_lamp_wood.png b/homedecor/textures/homedecor_table_standing_lamp_wood.png
deleted file mode 100644
index 91980ef1..00000000
Binary files a/homedecor/textures/homedecor_table_standing_lamp_wood.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_white_wood.png b/homedecor/textures/homedecor_white_wood.png
deleted file mode 100644
index 4fd926fc..00000000
Binary files a/homedecor/textures/homedecor_white_wood.png and /dev/null differ
diff --git a/homedecor/window_treatments.lua b/homedecor/window_treatments.lua
index 97309738..637db48a 100644
--- a/homedecor/window_treatments.lua
+++ b/homedecor/window_treatments.lua
@@ -171,8 +171,8 @@ for c in ipairs(curtaincolors) do
 end
 
 local mats = {
-	{ "brass", "Brass", "homedecor_tile_brass.png" },
-	{ "wrought_iron", "Wrought iron", "homedecor_tile_wrought_iron.png" },
+	{ "brass", "Brass", "homedecor_generic_metal_brass.png" },
+	{ "wrought_iron", "Wrought iron", "homedecor_generic_metal_wrought_iron.png" },
 	{ "wood", "Wooden", "default_wood.png" }
 }