update castles, areas, homedecor, plantlife,

gloopblocks, hotbar, inspector, maptools, mesecons,
moreblocks, moreores, technic, teleport_request, and
worldedit

switched to caverealms_lite (with minor fixes by me)
switched to CWz's fork of player_textures

The homedecor update brings in the big split, and will
require you to re-enable all modpack components in
order to avoid loss of content.

948 files changed, 6500 insertions, 5893 deletions

diff --git a/anvil/README.md b/anvil/README.md
index 227321f..f8cc4e7 100644
--- a/anvil/README.md
+++ b/anvil/README.md
@@ -1,3 +1,5 @@
 Anvil mod by Sokomine, originally a part of the Cottages mod but extracted to stand alone.
 
-This anvil (and its associated hammer) allows a player to repair worn tools. Place the worn tool in the anvil's inventory and strike it with the hammer to improve its condition.
\ No newline at end of file
+This anvil (and its associated hammer) allows a player to repair worn tools. Place the worn tool in the anvil's inventory and strike it with the hammer to improve its condition.
+
+By default, a hammer can be repaired on the anvil just like any other tool, allowing for infinite recycling of worn tools. Set "anvil_hammer_is_repairable false" to prevent this.
\ No newline at end of file
diff --git a/anvil/init.lua b/anvil/init.lua
index fa554cd..324fba1 100644
--- a/anvil/init.lua
+++ b/anvil/init.lua
@@ -7,18 +7,32 @@
 
 anvil = {
 	setting = {
-		item_displacement = 7/16,
+		item_displacement = 2/16,
 	}
 }
 
 minetest.register_alias("castle:anvil", "anvil:anvil")
 
+local hammer_repairable = minetest.setting_getbool("anvil_hammer_is_repairable")
+if hammer_repairable == nil then hammer_repairable = true end
+
+local make_unrepairable = function(item_name)
+	local item_def = minetest.registered_items[item_name]
+	if item_def then
+		item_def.groups.not_repaired_by_anvil = 1
+		minetest.override_item(item_name, {groups = item_def.groups})
+	end
+end
+make_unrepairable("technic:water_can")
+make_unrepairable("technic:lava_can")
+
 -- internationalization boilerplate
 local MP = minetest.get_modpath(minetest.get_current_modname())
 local S, NS = dofile(MP.."/intllib.lua")
 
 -- the hammer for the anvil
-minetest.register_tool("anvil:hammer", {
+
+local hammer_def = {
 	description = S("Steel blacksmithing hammer"),
 	_doc_items_longdesc = S("A tool for repairing other tools at a blacksmith's anvil."),
 	_doc_items_usagehelp = S("Use this hammer to strike blows upon an anvil bearing a damaged tool and you can repair it. It can also be used for smashing stone, but it is not well suited to this task."),
@@ -34,7 +48,13 @@ minetest.register_tool("anvil:hammer", {
 		},
 		damage_groups = {fleshy=6},
 	}
-})
+}
+
+if not hammer_repairable then
+	hammer_def.groups = {["not_repaired_by_anvil"] = 1}
+end
+
+minetest.register_tool("anvil:hammer", hammer_def)
 
 local tmp = {}
 
@@ -92,7 +112,14 @@ local update_item = function(pos, node)
 		tmp.texture = inv:get_stack("input", 1):get_name()
 		local e = minetest.add_entity(pos,"anvil:item")
 		local yaw = math.pi*2 - node.param2 * math.pi/2
-		e:setyaw(yaw)
+		if e.set_rotation == nil then
+			-- This is for 0.4.16 support, remove it eventually
+			e:set_yaw(yaw)
+			pos.y = pos.y + 5/16
+			e:set_pos(pos)
+		else
+			e:set_rotation({x=-1.5708, y=yaw, z=0}) -- x is pitch, 1.5708 is 90 degrees.
+		end
 	end
 end
 
@@ -161,14 +188,17 @@ minetest.register_node("anvil:anvil", {
 		if listname~="input" then
 			return 0
 		end
-		if (listname=='input'
-			and(stack:get_wear() == 0
-			or minetest.get_item_group(stack:get_name(), "not_repaired_by_anvil") ~= 0
-			or stack:get_name() == "technic:water_can"
-			or stack:get_name() == "technic:lava_can" )) then
-
-			minetest.chat_send_player( player:get_player_name(), S('This anvil is for damaged tools only.'))
-			return 0
+		if (listname=='input') then
+			if (stack:get_wear() == 0) then
+				minetest.chat_send_player( player:get_player_name(), S('This anvil is for damaged tools only.'))
+				return 0
+			end
+		
+			if (minetest.get_item_group(stack:get_name(), "not_repaired_by_anvil") ~= 0) then
+				local item_def = minetest.registered_items[stack:get_name()]
+				minetest.chat_send_player( player:get_player_name(), S('@1 cannot be repaired with an anvil.', item_def.description))
+				return 0
+			end
 		end
 
 		if meta:get_inventory():room_for_item("input", stack) then
diff --git a/anvil/locale/de.po b/anvil/locale/de.po
index 80a33a6..0d15a06 100644
--- a/anvil/locale/de.po
+++ b/anvil/locale/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-07 22:17-0700\n"
+"POT-Creation-Date: 2019-04-14 21:16-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: XanthinLanguage-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -16,32 +16,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: init.lua:19
+#: init.lua:36
 msgid "Steel blacksmithing hammer"
 msgstr ""
 
-#: init.lua:20
+#: init.lua:37
 #, fuzzy
 msgid "A tool for repairing other tools at a blacksmith's anvil."
 msgstr "Stahlhammer um Werkzeuge auf dem Amboss zu reparieren"
 
-#: init.lua:21
+#: init.lua:38
 msgid ""
 "Use this hammer to strike blows upon an anvil bearing a damaged tool and you "
 "can repair it. It can also be used for smashing stone, but it is not well "
 "suited to this task."
 msgstr ""
 
-#: init.lua:98
+#: init.lua:136
 msgid "Anvil"
 msgstr "Amboss"
 
-#: init.lua:99
+#: init.lua:137
 msgid ""
 "A tool for repairing other tools in conjunction with a blacksmith's hammer."
 msgstr ""
 
-#: init.lua:100
+#: init.lua:138
 msgid ""
 "Right-click on this anvil with a damaged tool to place the damaged tool upon "
 "it. You can then repair the damaged tool by striking it with a blacksmith's "
@@ -50,12 +50,16 @@ msgid ""
 "hand."
 msgstr ""
 
-#: init.lua:155
+#: init.lua:193
 #, fuzzy
 msgid "This anvil is for damaged tools only."
 msgstr "Das Werkstueckfeld gilt nur fuer beschaedigtes Werkzeug."
 
-#: init.lua:267
+#: init.lua:199
+msgid "@1 cannot be repaired with an anvil."
+msgstr ""
+
+#: init.lua:325
 msgid "Your @1 has been repaired successfully."
 msgstr ""
 
diff --git a/anvil/locale/es.po b/anvil/locale/es.po
index 167dbb4..8e9216b 100644
--- a/anvil/locale/es.po
+++ b/anvil/locale/es.po
@@ -60,6 +60,10 @@ msgstr ""
 msgid "This anvil is for damaged tools only."
 msgstr "Este yunque es sólo para herramientas dañadas"
 
+#: init.lua:199
+msgid "@1 cannot be repaired with an anvil."
+msgstr ""
+
 #: init.lua:267
 msgid "Your @1 has been repaired successfully."
 msgstr "Su @1 ha sido reparado correctamente."
diff --git a/anvil/locale/fr.po b/anvil/locale/fr.po
index 66cc21d..788b9a4 100644
--- a/anvil/locale/fr.po
+++ b/anvil/locale/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-26 12:18+0200\n"
+"POT-Creation-Date: 2019-04-14 21:16-0600\n"
 "PO-Revision-Date: 2017-06-26 12:22+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,15 +18,15 @@ msgstr ""
 "X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: init.lua:19
+#: init.lua:36
 msgid "Steel blacksmithing hammer"
 msgstr "Marteau de forgeron en acier"
 
-#: init.lua:20
+#: init.lua:37
 msgid "A tool for repairing other tools at a blacksmith's anvil."
 msgstr "Un outil pour réparer les autres outils avec une enclume de forgeron."
 
-#: init.lua:21
+#: init.lua:38
 msgid ""
 "Use this hammer to strike blows upon an anvil bearing a damaged tool and you "
 "can repair it. It can also be used for smashing stone, but it is not well "
@@ -36,18 +36,18 @@ msgstr ""
 "ainsi vous pourrez le réparer. Il peut être aussi utilisé pour casser de la "
 "pierre, mais il n'est pas adapté à cette tâche."
 
-#: init.lua:98
+#: init.lua:136
 msgid "Anvil"
 msgstr "Enclume"
 
-#: init.lua:99
+#: init.lua:137
 msgid ""
 "A tool for repairing other tools in conjunction with a blacksmith's hammer."
 msgstr ""
 "Un outil pour réparer les autres outils à utiliser avec un marteau de "
 "forgeron."
 
-#: init.lua:100
+#: init.lua:138
 msgid ""
 "Right-click on this anvil with a damaged tool to place the damaged tool upon "
 "it. You can then repair the damaged tool by striking it with a blacksmith's "
@@ -61,10 +61,14 @@ msgstr ""
 "l'outil entièrement. Pour récupérer l'outil, frappez dessus ou faites un "
 "click-droit en ayant la main vide."
 
-#: init.lua:155
+#: init.lua:193
 msgid "This anvil is for damaged tools only."
 msgstr "L'enclume s'utilise sur les outils endommagés."
 
-#: init.lua:267
+#: init.lua:199
+msgid "@1 cannot be repaired with an anvil."
+msgstr ""
+
+#: init.lua:325
 msgid "Your @1 has been repaired successfully."
 msgstr "Votre @1 a été réparé avec succès."
diff --git a/anvil/locale/it.po b/anvil/locale/it.po
index 3659a1d..826625a 100644
--- a/anvil/locale/it.po
+++ b/anvil/locale/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Italian locale file for the Anvil module\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-07 22:17-0700\n"
+"POT-Creation-Date: 2019-04-14 21:16-0600\n"
 "PO-Revision-Date: 2017-08-18 16:14+0100\n"
 "Last-Translator: H4mlet <h4mlet@riseup.net>\n"
 "Language-Team: \n"
@@ -18,15 +18,15 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: init.lua:19
+#: init.lua:36
 msgid "Steel blacksmithing hammer"
 msgstr "Martello da fabbro di acciaio"
 
-#: init.lua:20
+#: init.lua:37
 msgid "A tool for repairing other tools at a blacksmith's anvil."
 msgstr "Un attrezzo per riparare altri attrezzi su di una incudine da fabbro."
 
-#: init.lua:21
+#: init.lua:38
 msgid ""
 "Use this hammer to strike blows upon an anvil bearing a damaged tool and you "
 "can repair it. It can also be used for smashing stone, but it is not well "
@@ -36,16 +36,16 @@ msgstr ""
 "danneggiato e potrete ripararlo. Può anche essere usato per colpire la "
 "pietra, ma non è molto adatto a questo compito."
 
-#: init.lua:98
+#: init.lua:136
 msgid "Anvil"
 msgstr "Incudine"
 
-#: init.lua:99
+#: init.lua:137
 msgid ""
 "A tool for repairing other tools in conjunction with a blacksmith's hammer."
 msgstr "Un attrezzo per riparare altri attrezzi usando un martello da fabbro."
 
-#: init.lua:100
+#: init.lua:138
 msgid ""
 "Right-click on this anvil with a damaged tool to place the damaged tool upon "
 "it. You can then repair the damaged tool by striking it with a blacksmith's "
@@ -59,10 +59,14 @@ msgstr ""
 "gravemente danneggiato. Per riprendere l'attrezzo colpite o fate click "
 "destro sull'incudine a mani vuote."
 
-#: init.lua:155
+#: init.lua:193
 msgid "This anvil is for damaged tools only."
 msgstr "Questa incudine è solo per attrezzi danneggiati."
 
-#: init.lua:267
+#: init.lua:199
+msgid "@1 cannot be repaired with an anvil."
+msgstr ""
+
+#: init.lua:325
 msgid "Your @1 has been repaired successfully."
 msgstr "La/il vostr* @1 è stat* riparat* con successo."
diff --git a/anvil/locale/template.pot b/anvil/locale/template.pot
index 0be726a..44c68c3 100644
--- a/anvil/locale/template.pot
+++ b/anvil/locale/template.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-07 22:17-0700\n"
+"POT-Creation-Date: 2019-04-14 21:16-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: init.lua:19
+#: init.lua:36
 msgid "Steel blacksmithing hammer"
 msgstr ""
 
-#: init.lua:20
+#: init.lua:37
 msgid "A tool for repairing other tools at a blacksmith's anvil."
 msgstr ""
 
-#: init.lua:21
+#: init.lua:38
 msgid ""
 "Use this hammer to strike blows upon an anvil bearing a damaged tool and you "
 "can repair it. It can also be used for smashing stone, but it is not well "
 "suited to this task."
 msgstr ""
 
-#: init.lua:98
+#: init.lua:136
 msgid "Anvil"
 msgstr ""
 
-#: init.lua:99
+#: init.lua:137
 msgid ""
 "A tool for repairing other tools in conjunction with a blacksmith's hammer."
 msgstr ""
 
-#: init.lua:100
+#: init.lua:138
 msgid ""
 "Right-click on this anvil with a damaged tool to place the damaged tool upon "
 "it. You can then repair the damaged tool by striking it with a blacksmith's "
@@ -50,10 +50,14 @@ msgid ""
 "hand."
 msgstr ""
 
-#: init.lua:155
+#: init.lua:193
 msgid "This anvil is for damaged tools only."
 msgstr ""
 
-#: init.lua:267
+#: init.lua:199
+msgid "@1 cannot be repaired with an anvil."
+msgstr ""
+
+#: init.lua:325
 msgid "Your @1 has been repaired successfully."
 msgstr ""
diff --git a/anvil/locale/update.bat b/anvil/locale/update.bat
new file mode 100644
index 0000000..e87d44c
--- /dev/null
+++ b/anvil/locale/update.bat
@@ -0,0 +1,6 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cd ..
+set LIST=
+for /r %%X in (*.lua) do set LIST=!LIST! %%X
+..\intllib\tools\xgettext.bat %LIST%
\ No newline at end of file
diff --git a/anvil/settingtypes.txt b/anvil/settingtypes.txt
new file mode 100644
index 0000000..9b845cc
--- /dev/null
+++ b/anvil/settingtypes.txt
@@ -0,0 +1 @@
+anvil_hammer_is_repairable (Hammer can be repaired on anvil) bool true
diff --git a/areas/.luacheckrc b/areas/.luacheckrc
index 15eed66..c0ea991 100644
--- a/areas/.luacheckrc
+++ b/areas/.luacheckrc
@@ -3,13 +3,17 @@ allow_defined_top = true
 
 read_globals = {
 	"DIR_DELIM",
-	"minetest", "core",
+	"core",
 	"dump",
 	"vector", "nodeupdate",
 	"VoxelManip", "VoxelArea",
 	"PseudoRandom", "ItemStack",
+	"AreaStore",
 	"intllib",
 	"default",
 	table = { fields = { "copy", "getn" } }
 }
 
+globals = {
+	"minetest"
+}
diff --git a/areas/chatcommands.lua b/areas/chatcommands.lua
index 6079e93..ddff850 100644
--- a/areas/chatcommands.lua
+++ b/areas/chatcommands.lua
@@ -60,7 +60,7 @@ minetest.register_chatcommand("set_owner", {
 
 		local id = areas:add(ownerName, areaName, pos1, pos2, nil)
 		areas:save()
-	
+
 		minetest.chat_send_player(ownerName,
 				"You have been granted control over area #"..
 				id..". Type /list_areas to show your areas.")
@@ -383,10 +383,10 @@ minetest.register_chatcommand("area_info", {
 			table.insert(lines, ("%s spanning up to %dx%dx%d.")
 				:format(str, size.x, size.y, size.z))
 		end
-		local function priv_limit_info(priv, max_count, max_size)
+		local function priv_limit_info(lpriv, lmax_count, lmax_size)
 			size_info(("Players with the %q privilege"..
 				" can protect up to %d areas"):format(
-					priv, max_count), max_size)
+					lpriv, lmax_count), lmax_size)
 		end
 		if self_prot then
 			if privs.areas then
diff --git a/areas/legacy.lua b/areas/legacy.lua
index 83b3d27..876b88d 100644
--- a/areas/legacy.lua
+++ b/areas/legacy.lua
@@ -10,7 +10,7 @@ minetest.register_chatcommand("legacy_load_areas", {
 		minetest.chat_send_player(name, "Converting areas...")
 		local version = tonumber(param)
 		if version == 0 then
-			err = areas:node_ownership_load()
+			local err = areas:node_ownership_load()
 			if err then
 				minetest.chat_send_player(name, "Error loading legacy file: "..err)
 				return
@@ -48,6 +48,7 @@ minetest.register_chatcommand("legacy_load_areas", {
 
 function areas:node_ownership_load()
 	local filename = minetest.get_worldpath().."/owners.tbl"
+	local tables, err
 	tables, err = loadfile(filename)
 	if err then
 		return err
diff --git a/areas/pos.lua b/areas/pos.lua
index f969aaa..36a6b78 100644
--- a/areas/pos.lua
+++ b/areas/pos.lua
@@ -11,6 +11,16 @@ areas.set_pos = {}
 areas.pos1 = {}
 areas.pos2 = {}
 
+local LIMIT = 30992 -- this is due to MAPBLOCK_SIZE=16!
+
+local function posLimit(pos)
+	return {
+		x = math.max(math.min(pos.x, LIMIT), -LIMIT),
+		y = math.max(math.min(pos.y, LIMIT), -LIMIT),
+		z = math.max(math.min(pos.z, LIMIT), -LIMIT)
+	}
+end
+
 minetest.register_chatcommand("select_area", {
 	params = "<ID>",
 	description = "Select a area by id.",
@@ -35,7 +45,7 @@ minetest.register_chatcommand("area_pos1", {
 		.." location or the one specified",
 	privs = {},
 	func = function(name, param)
-		local pos = nil
+		local pos
 		local found, _, x, y, z = param:find(
 				"^(-?%d+)[, ](-?%d+)[, ](-?%d+)$")
 		if found then
@@ -50,7 +60,7 @@ minetest.register_chatcommand("area_pos1", {
 		else
 			return false, "Invalid usage, see /help area_pos1."
 		end
-		pos = vector.round(pos)
+		pos = posLimit(vector.round(pos))
 		areas:setPos1(name, pos)
 		return true, "Area position 1 set to "
 				..minetest.pos_to_string(pos)
@@ -62,7 +72,7 @@ minetest.register_chatcommand("area_pos2", {
 	description = "Set area protection region position 2 to your"
 		.." location or the one specified",
 	func = function(name, param)
-		local pos = nil
+		local pos
 		local found, _, x, y, z = param:find(
 				"^(-?%d+)[, ](-?%d+)[, ](-?%d+)$")
 		if found then
@@ -77,7 +87,7 @@ minetest.register_chatcommand("area_pos2", {
 		else
 			return false, "Invalid usage, see /help area_pos2."
 		end
-		pos = vector.round(pos)
+		pos = posLimit(vector.round(pos))
 		areas:setPos2(name, pos)
 		return true, "Area position 2 set to "
 				..minetest.pos_to_string(pos)
@@ -129,14 +139,6 @@ function areas:getPos(playerName)
 	return areas:sortPos(pos1, pos2)
 end
 
-local function posLimit(pos)
-	return {
-		x = math.max(math.min(pos.x, 31000), -31000),
-		y = math.max(math.min(pos.y, 31000), -31000),
-		z = math.max(math.min(pos.z, 31000), -31000)
-	}
-end
-
 function areas:setPos1(playerName, pos)
 	areas.pos1[playerName] = posLimit(pos)
 	areas.markPos1(playerName)
diff --git a/basic_materials/misc.lua b/basic_materials/misc.lua
index 2d00258..3605ac9 100644
--- a/basic_materials/misc.lua
+++ b/basic_materials/misc.lua
@@ -41,7 +41,7 @@ minetest.register_node("basic_materials:concrete_block", {
 
 minetest.register_craft({
 	type = "shapeless",
-	output = "basic_materials:oil_extract 3",
+	output = "basic_materials:oil_extract 1",
 	recipe = {
 		"group:leaves",
 		"group:leaves",
diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua
index 8d6520b..1ac24f5 100644
--- a/building_blocks/alias.lua
+++ b/building_blocks/alias.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
 	minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")
diff --git a/building_blocks/depends.txt b/building_blocks/depends.txt
index 641d412..a890df8 100644
--- a/building_blocks/depends.txt
+++ b/building_blocks/depends.txt
@@ -1,5 +1,5 @@
 default
-homedecor_i18n
+homedecor_common
 moreblocks?
 gloopblocks?
 stairs?
diff --git a/building_blocks/init.lua b/building_blocks/init.lua
index fc0c9e4..fbb81a4 100644
--- a/building_blocks/init.lua
+++ b/building_blocks/init.lua
@@ -1,7 +1,7 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 local modpath = minetest.get_modpath("building_blocks")
 
 dofile(modpath.."/alias.lua")
 dofile(modpath.."/node_stairs.lua")
 dofile(modpath.."/others.lua")
-dofile(modpath.."/recipes.lua")
\ No newline at end of file
+dofile(modpath.."/recipes.lua")
diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua
index b0fecb4..daba567 100644
--- a/building_blocks/node_stairs.lua
+++ b/building_blocks/node_stairs.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
 
@@ -33,7 +33,7 @@ local function building_blocks_stairs(nodename, def)
 				("%s Slab"):format(def.description),
 				def.sounds
 			)
-		end	
+		end
 	end
 end
 
diff --git a/building_blocks/others.lua b/building_blocks/others.lua
index 180aa70..2cc613f 100644
--- a/building_blocks/others.lua
+++ b/building_blocks/others.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 minetest.register_craftitem("building_blocks:sticks", {
 	description = S("Small bundle of sticks"),
@@ -20,4 +20,4 @@ minetest.register_tool("building_blocks:knife", {
 			fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
 		}
 	},
-})
\ No newline at end of file
+})
diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua
index 42ac0a8..689643f 100644
--- a/building_blocks/recipes.lua
+++ b/building_blocks/recipes.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 if minetest.get_modpath("moreblocks") then
 	minetest.register_craft({
diff --git a/building_blocks/textures/building_blocks_marble.png b/building_blocks/textures/building_blocks_marble.png
index 94aad99..497e2b6 100644
--- a/building_blocks/textures/building_blocks_marble.png
+++ b/building_blocks/textures/building_blocks_marble.png
diff --git a/castle_gates/gate_functions.lua b/castle_gates/gate_functions.lua
index 5d1e6b7..c44cda5 100644
--- a/castle_gates/gate_functions.lua
+++ b/castle_gates/gate_functions.lua
@@ -116,6 +116,8 @@ end
 
 
 local get_door_layout = function(pos, facedir, player)
+	if facedir > 23 then return nil end -- A bug in another mod once resulted in bad param2s being written to nodes, this will at least prevent crashes if something like that happens again.
+
 	-- This method does a flood-fill looking for all nodes that meet the following criteria:
 	-- belongs to a "castle_gate" group
 	-- has the same "back" direction as the initial node
@@ -153,7 +155,7 @@ local get_door_layout = function(pos, facedir, player)
 		local test_node_def = minetest.registered_nodes[test_node.name]
 		can_slide_to:set_pos(test_pos, test_node_def.buildable_to == true)
 		
-		if test_node_def.paramtype2 == "facedir" then -- prospective door nodes need to be of type facedir
+		if test_node_def.paramtype2 == "facedir" and test_node.param2 <= 23 then -- prospective door nodes need to be of type facedir and have a valid param2
 			local test_node_dirs = get_dirs(test_node.param2)
 			local coplanar = vector.equals(test_node_dirs.back, door.directions.back) -- the "back" vector needs to point in the same direction as the rest of the door
 			
diff --git a/castle_gates/gates.lua b/castle_gates/gates.lua
index e7195ef..ce47176 100644
--- a/castle_gates/gates.lua
+++ b/castle_gates/gates.lua
@@ -2,21 +2,37 @@
 local MP = minetest.get_modpath(minetest.get_current_modname())
 local S, NS = dofile(MP.."/intllib.lua")
 
-minetest.register_node("castle_gates:portcullis_bars", {
+minetest.register_alias("castle_gates:gate_edge",				"castle_gates:wood_gate_edge")
+minetest.register_alias("castle_gates:gate_edge_handle",		"castle_gates:wood_gate_edge_handle")
+minetest.register_alias("castle_gates:gate_hinge",				"castle_gates:wood_gate_hinge")
+minetest.register_alias("castle_gates:gate_panel",				"castle_gates:wood_gate_panel")
+minetest.register_alias("castle_gates:portcullis_bars",			"castle_gates:wood_portcullis_bars")
+minetest.register_alias("castle_gates:portcullis_bars_bottom",	"castle_gates:wood_portcullis_bars_bottom")
+
+local register_gates = function(node_prefix, material_description, material_texture, gate_groups, gate_sounds, portcullis_recipe, panel_recipe)
+
+local portcullis_groups = {castle_gate = 1, flow_through = 1}
+local panel_groups = {castle_gate = 1}
+for group, val in pairs(gate_groups) do
+	portcullis_groups[group] = val
+	panel_groups[group] = val
+end
+
+minetest.register_node("castle_gates:"..node_prefix.."_portcullis_bars", {
 	drawtype = "nodebox",
-	description = S("Portcullis Bars"),
+	description = S("@1 Portcullis Bars", material_description),
 	_doc_items_longdesc = castle_gates.doc.portcullis_bars_longdesc,
 	_doc_items_usagehelp = castle_gates.doc.portcullis_bars_usagehelp,
-	groups = {castle_gate = 1, choppy = 1, flow_through = 1},
+	groups = portcullis_groups,
 	tiles = {
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_portcullis_mask.png)",
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_portcullis_mask.png)",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_portcullis_mask.png)",
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_portcullis_mask.png)",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_portcullis_mask.png)",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_portcullis_mask.png)",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_portcullis_mask.png)",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_portcullis_mask.png)",
 		},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = gate_sounds,
 	paramtype = "light",
 	paramtype2 = "facedir",
 	node_box = {
@@ -32,21 +48,21 @@ minetest.register_node("castle_gates:portcullis_bars", {
 	on_rightclick = castle_gates.trigger_gate,
 })
 
-minetest.register_node("castle_gates:portcullis_bars_bottom", {
+minetest.register_node("castle_gates:"..node_prefix.."_portcullis_bars_bottom", {
 	drawtype = "nodebox",
-	description = S("Portcullis Bottom"),
+	description = S("@1 Portcullis Bottom", material_description),
 	_doc_items_longdesc = castle_gates.doc.portcullis_bars_bottom_longdesc,
 	_doc_items_usagehelp = castle_gates.doc.portcullis_bars_bottom_usagehelp,
-	groups = {castle_gate = 1, choppy = 1, flow_through = 1},
+	groups = portcullis_groups,
 	tiles = {
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_portcullis_mask.png)",
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_portcullis_mask.png)",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_portcullis_mask.png)",
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_portcullis_mask.png)",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_portcullis_mask.png)",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_portcullis_mask.png)",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_portcullis_mask.png)",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_portcullis_mask.png)",
 		},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = gate_sounds,
 	paramtype = "light",
 	paramtype2 = "facedir",
 		node_box = {
@@ -67,53 +83,46 @@ minetest.register_node("castle_gates:portcullis_bars_bottom", {
 })
 
 minetest.register_craft({
-	output = "castle_gates:portcullis_bars 3",
-	recipe = {
-		{"group:wood","default:steel_ingot","group:wood" },
-		{"group:wood","default:steel_ingot","group:wood" },
-		{"group:wood","default:steel_ingot","group:wood" },
-	},
+	output = "castle_gates:"..node_prefix.."_portcullis_bars 3",
+	recipe = portcullis_recipe,
 })
 
 minetest.register_craft({
-	output = "castle_gates:portcullis_bars",
+	output = "castle_gates:"..node_prefix.."_portcullis_bars",
 	recipe = {
-		{"castle_gates:portcullis_bars_bottom"}
+		{"castle_gates:"..node_prefix.."_portcullis_bars_bottom"}
 	},
 })
 
 minetest.register_craft({
-	output = "castle_gates:portcullis_bars_bottom",
+	output = "castle_gates:"..node_prefix.."_portcullis_bars_bottom",
 	recipe = {
-		{"castle_gates:portcullis_bars"}
+		{"castle_gates:"..node_prefix.."_portcullis_bars"}
 	},
 })
 
 --------------------------------------------------------------------------------------------------------------
 
 minetest.register_craft({
-	output = "castle_gates:gate_panel 8",
-	recipe = {
-		{"stairs:slab_wood","stairs:slab_wood", ""},
-		{"stairs:slab_wood","stairs:slab_wood", ""},
-	},
+	output = "castle_gates:"..node_prefix.."_gate_panel 8",
+	recipe = panel_recipe,
 })
 
-minetest.register_node("castle_gates:gate_panel", {
+minetest.register_node("castle_gates:"..node_prefix.."_gate_panel", {
 	drawtype = "nodebox",
-	description = S("Gate Door"),
+	description = S("@1 Gate Door", material_description),
 	_doc_items_longdesc = castle_gates.doc.gate_panel_longdesc,
 	_doc_items_usagehelp = castle_gates.doc.gate_panel_usagehelp,
-	groups = {choppy = 1, castle_gate = 1},
+	groups = panel_groups,
 	tiles = {
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
 		},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = gate_sounds,
 	paramtype = "light",
 	paramtype2 = "facedir",
 		node_box = {
@@ -126,26 +135,26 @@ minetest.register_node("castle_gates:gate_panel", {
 })
 
 minetest.register_craft({
-	output = "castle_gates:gate_edge",
+	output = "castle_gates:"..node_prefix.."_gate_edge",
 	type = "shapeless",
-	recipe = {"castle_gates:gate_panel"},
+	recipe = {"castle_gates:"..node_prefix.."_gate_panel"},
 })
 
-minetest.register_node("castle_gates:gate_edge", {
+minetest.register_node("castle_gates:"..node_prefix.."_gate_edge", {
 	drawtype = "nodebox",
-	description = S("Gate Door Edge"),
+	description = S("@1 Gate Door Edge", material_description),
 	_doc_items_longdesc = castle_gates.doc.gate_edge_longdesc,
 	_doc_items_usagehelp = castle_gates.doc.gate_edge_usagehelp,
-	groups = {choppy = 1, castle_gate = 1},
+	groups = panel_groups,
 	tiles = {
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90",
-		"default_wood.png^[transformR90^(default_coal_block.png^[mask:castle_door_edge_mask.png^[transformFX)",
-		"default_wood.png^[transformR90^(default_coal_block.png^[mask:castle_door_edge_mask.png)",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90",
+		material_texture.."^[transformR90^(default_coal_block.png^[mask:castle_door_edge_mask.png^[transformFX)",
+		material_texture.."^[transformR90^(default_coal_block.png^[mask:castle_door_edge_mask.png)",
 		},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = gate_sounds,
 	paramtype = "light",
 	paramtype2 = "facedir",
 		node_box = {
@@ -159,32 +168,32 @@ minetest.register_node("castle_gates:gate_edge", {
 })
 
 minetest.register_craft({
-	output = "castle_gates:gate_edge_handle",
+	output = "castle_gates:"..node_prefix.."_gate_edge_handle",
 	type = "shapeless",
-	recipe = {"castle_gates:gate_edge"},
+	recipe = {"castle_gates:"..node_prefix.."_gate_edge"},
 })
 
 minetest.register_craft({
-	output = "castle_gates:gate_panel",
+	output = "castle_gates:"..node_prefix.."_gate_panel",
 	type = "shapeless",
-	recipe = {"castle_gates:gate_edge_handle"},
+	recipe = {"castle_gates:"..node_prefix.."_gate_edge_handle"},
 })
 
-minetest.register_node("castle_gates:gate_edge_handle", {
+minetest.register_node("castle_gates:"..node_prefix.."_gate_edge_handle", {
 	drawtype = "nodebox",
-	description = S("Gate Door With Handle"),
+	description = S("@1 Gate Door With Handle", material_description),
 	_doc_items_longdesc = castle_gates.doc.gate_edge_handle_longdesc,
 	_doc_items_usagehelp = castle_gates.doc.gate_edge_handle_usagehelp,
-	groups = {choppy = 1, castle_gate = 1},
+	groups = panel_groups,
 	tiles = {
-		"castle_steel.png^(default_wood.png^[mask:castle_door_side_mask.png^[transformR90)",
-		"castle_steel.png^(default_wood.png^[mask:castle_door_side_mask.png^[transformR270)",
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:castle_door_side_mask.png)",
-		"castle_steel.png^(default_wood.png^[transformR90^[mask:(castle_door_side_mask.png^[transformFX))",
-		"default_wood.png^[transformR90^(default_coal_block.png^[mask:castle_door_edge_mask.png^[transformFX)^(castle_steel.png^[mask:castle_door_handle_mask.png^[transformFX)",
-		"default_wood.png^[transformR90^(default_coal_block.png^[mask:castle_door_edge_mask.png)^(castle_steel.png^[mask:castle_door_handle_mask.png)",
+		"castle_steel.png^("..material_texture.."^[mask:castle_door_side_mask.png^[transformR90)",
+		"castle_steel.png^("..material_texture.."^[mask:castle_door_side_mask.png^[transformR270)",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:castle_door_side_mask.png)",
+		"castle_steel.png^("..material_texture.."^[transformR90^[mask:(castle_door_side_mask.png^[transformFX))",
+		material_texture.."^[transformR90^(default_coal_block.png^[mask:castle_door_edge_mask.png^[transformFX)^(castle_steel.png^[mask:castle_door_handle_mask.png^[transformFX)",
+		material_texture.."^[transformR90^(default_coal_block.png^[mask:castle_door_edge_mask.png)^(castle_steel.png^[mask:castle_door_handle_mask.png)",
 		},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = gate_sounds,
 	paramtype = "light",
 	paramtype2 = "facedir",
 		node_box = {
@@ -205,24 +214,24 @@ minetest.register_node("castle_gates:gate_edge_handle", {
 ------------------------------------------------------------------------------
 
 minetest.register_craft({
-	output = "castle_gates:gate_hinge 3",
+	output = "castle_gates:"..node_prefix.."_gate_hinge 3",
 	recipe = {
-		{"", "castle_gates:gate_panel", ""},
-		{"default:steel_ingot", "castle_gates:gate_panel", ""},
-		{"", "castle_gates:gate_panel", ""}
+		{"", "castle_gates:"..node_prefix.."_gate_panel", ""},
+		{"default:steel_ingot", "castle_gates:"..node_prefix.."_gate_panel", ""},
+		{"", "castle_gates:"..node_prefix.."_gate_panel", ""}
 	},
 })
 
-minetest.register_node("castle_gates:gate_hinge", {
+minetest.register_node("castle_gates:"..node_prefix.."_gate_hinge", {
 	drawtype = "nodebox",
-	description = S("Gate Door With Hinge"),
+	description = S("@1 Gate Door With Hinge", material_description),
 	_doc_items_longdesc = castle_gates.doc.gate_hinge_longdesc,
 	_doc_items_usagehelp = castle_gates.doc.gate_hinge_usagehelp,
-	groups = {choppy = 1, castle_gate = 1},
+	groups = panel_groups,
 	tiles = {
-		"default_wood.png^[transformR90",
+		material_texture.."^[transformR90",
 		},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = gate_sounds,
 	paramtype = "light",
 	paramtype2 = "facedir",
 	
@@ -241,3 +250,29 @@ minetest.register_node("castle_gates:gate_hinge", {
 	_gate_hinge = {axis="top", offset={"front","left"}},
 	on_rightclick = castle_gates.trigger_gate,
 })
+
+end
+
+register_gates("wood", S("Wooden"), "default_wood.png", {choppy = 1}, default.node_sound_wood_defaults(),
+	{
+		{"group:wood","default:steel_ingot","group:wood" },
+		{"group:wood","default:steel_ingot","group:wood" },
+		{"group:wood","default:steel_ingot","group:wood" },
+	},
+	{
+		{"stairs:slab_wood","stairs:slab_wood", ""},
+		{"stairs:slab_wood","stairs:slab_wood", ""},
+	}
+)
+
+register_gates("steel", S("Steel"), "default_steel_block.png", {cracky = 1, level = 2}, default.node_sound_metal_defaults(),
+	{
+		{"","default:steel_ingot","" },
+		{"default:steel_ingot","default:steel_ingot","default:steel_ingot" },
+		{"","default:steel_ingot","" },
+	},
+	{
+		{"stairs:slab_steelblock","stairs:slab_steelblock", ""},
+		{"stairs:slab_steelblock","stairs:slab_steelblock", ""},
+	}
+)
diff --git a/castle_gates/locale/es.po b/castle_gates/locale/es.po
index c102161..f1e069b 100644
--- a/castle_gates/locale/es.po
+++ b/castle_gates/locale/es.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 23:41-0700\n"
+"POT-Creation-Date: 2019-04-14 22:15-0600\n"
 "PO-Revision-Date: 2017-04-28 11:56-0400\n"
 "Last-Translator: Carlos Barraza\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,8 +31,8 @@ msgid ""
 "The bottom edge of a portcullis gate, with knobs to lock securely into the "
 "floor."
 msgstr ""
-"Es el borde inferior de una puerta rastrillo, con perillas para bloquearla con "
-"seguridad en el piso"
+"Es el borde inferior de una puerta rastrillo, con perillas para bloquearla "
+"con seguridad en el piso"
 
 #: doc.lua:15
 msgid ""
@@ -41,8 +41,8 @@ msgid ""
 "just decorative."
 msgstr ""
 "Este bloque puede ser usado para definir el borde de una puerta rastrillo "
-"que esta cerca de otra  puerta, si tiene varias puertas independientes, "
-"de lo contrario es simplemente decorativo"
+"que esta cerca de otra  puerta, si tiene varias puertas independientes, de "
+"lo contrario es simplemente decorativo"
 
 #: doc.lua:17
 msgid "A basic gate panel."
@@ -67,10 +67,10 @@ msgid ""
 "separately, for example. Note that edges aren't strictly necessary for gates "
 "that stand alone."
 msgstr ""
-"El borde oscurecido de este panel marca el limite de la puerta."
-"Usted puede utilizar estos bloques para construir puertas dobles para asegurar "
-"que las dos puertas funcionen por separado, por ejemplo. Tenga en cuenta que "
-"los bordes no son estrictamente necesarios para las puertas individuales"
+"El borde oscurecido de este panel marca el limite de la puerta. Usted puede "
+"utilizar estos bloques para construir puertas dobles para asegurar que las "
+"dos puertas funcionen por separado, por ejemplo. Tenga en cuenta que los "
+"bordes no son estrictamente necesarios para las puertas individuales"
 
 #: doc.lua:23
 msgid "A gate edge with a handle."
@@ -106,7 +106,7 @@ msgstr ""
 msgid "A block with a slot to allow an adjacent sliding gate through."
 msgstr ""
 "Un bloque con una ranura en el medio para que una puerta deslizante pueda "
-"pasar a través de ella."
+"pasar a travs de ella."
 
 #: doc.lua:30
 msgid ""
@@ -146,8 +146,8 @@ msgid ""
 "Gates are large multi-node constructions that swing on hinges or slide out "
 "of the way when triggered."
 msgstr ""
-"Las puertas grandes son construcciones multi nodo que se abren usando bisagras "
-"o se deslizan hacia arriba cuando se activan"
+"Las puertas grandes son construcciones multi nodo que se abren usando "
+"bisagras o se deslizan hacia arriba cuando se activan"
 
 #: doc.lua:43
 msgid "Gate construction"
@@ -211,51 +211,64 @@ msgstr ""
 "puerta todavía busca obstrucciones en la región que está moviéndose y no "
 "girara si hay algo en el camino."
 
-
 #: doors.lua:8
 msgid "Oak Door"
 msgstr "Puerta de Roble"
 
-#: doors.lua:22
+#: doors.lua:37
 msgid "Jail Door"
 msgstr "Puerta de Cárcel"
 
-#: doors.lua:43
+#: doors.lua:54
 msgid "Jail Bars"
 msgstr ""
 
-#: gate_slots.lua:36
-msgid "Stonebrick"
-msgstr "Ladrillo de Piedra"
-
-#: gate_slots.lua:45
-msgid "@1 Gate Slot"
-msgstr "Espacio para Puerta de @1"
-
-#: gate_slots.lua:70
-msgid "@1 Gate Slot Reverse"
-msgstr "Espacio para Puerta Invertido de @1"
-
-#: gates.lua:7
-msgid "Portcullis Bars"
+#: gates.lua:23
+#, fuzzy
+msgid "@1 Portcullis Bars"
 msgstr "Barras de la Puerta Rastrillo"
 
-#: gates.lua:37
-msgid "Portcullis Bottom"
+#: gates.lua:53
+#, fuzzy
+msgid "@1 Portcullis Bottom"
 msgstr "Terminación de la Puerta Rastrillo"
 
-#: gates.lua:104
-msgid "Gate Door"
+#: gates.lua:113
+#, fuzzy
+msgid "@1 Gate Door"
 msgstr "Porción de la Puerta"
 
-#: gates.lua:136
-msgid "Gate Door Edge"
+#: gates.lua:145
+#, fuzzy
+msgid "@1 Gate Door Edge"
 msgstr "Borde de la Puerta"
 
-#: gates.lua:175
-msgid "Gate Door With Handle"
+#: gates.lua:184
+#, fuzzy
+msgid "@1 Gate Door With Handle"
 msgstr "Pestillo de la Puerta"
 
-#: gates.lua:218
-msgid "Gate Door With Hinge"
+#: gates.lua:227
+#, fuzzy
+msgid "@1 Gate Door With Hinge"
 msgstr "Bisagra de la Puerta"
+
+#: gates.lua:256
+msgid "Wooden"
+msgstr ""
+
+#: gates.lua:268
+msgid "Steel"
+msgstr ""
+
+#: gate_slots.lua:36
+msgid "Stonebrick"
+msgstr "Ladrillo de Piedra"
+
+#: gate_slots.lua:45
+msgid "@1 Gate Slot"
+msgstr "Espacio para Puerta de @1"
+
+#: gate_slots.lua:70
+msgid "@1 Gate Slot Reverse"
+msgstr "Espacio para Puerta Invertido de @1"
diff --git a/castle_gates/locale/it.po b/castle_gates/locale/it.po
index 8b5a169..379d533 100644
--- a/castle_gates/locale/it.po
+++ b/castle_gates/locale/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Castle Gates\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 23:41-0700\n"
+"POT-Creation-Date: 2019-04-14 22:15-0600\n"
 "PO-Revision-Date: 2017-09-26 23:51+0100\n"
 "Last-Translator: Hamlet <h4mlet@riseup.net>\n"
 "Language-Team: \n"
@@ -228,14 +228,52 @@ msgstr ""
 msgid "Oak Door"
 msgstr "Porta di quercia"
 
-#: doors.lua:22
+#: doors.lua:37
 msgid "Jail Door"
 msgstr "Porta della prigione"
 
-#: doors.lua:43
+#: doors.lua:54
 msgid "Jail Bars"
 msgstr "Sbarre della prigione"
 
+#: gates.lua:23
+#, fuzzy
+msgid "@1 Portcullis Bars"
+msgstr "Sbarre della saracinesca"
+
+#: gates.lua:53
+#, fuzzy
+msgid "@1 Portcullis Bottom"
+msgstr "Estremità inferiore della saracinesca"
+
+#: gates.lua:113
+#, fuzzy
+msgid "@1 Gate Door"
+msgstr "Segmento di cancello, porta o portone"
+
+#: gates.lua:145
+#, fuzzy
+msgid "@1 Gate Door Edge"
+msgstr "Estremità di cancello, porta o portone"
+
+#: gates.lua:184
+#, fuzzy
+msgid "@1 Gate Door With Handle"
+msgstr "Cancello, porta o portone con maniglia"
+
+#: gates.lua:227
+#, fuzzy
+msgid "@1 Gate Door With Hinge"
+msgstr "Cancello, porta o portone con cardine"
+
+#: gates.lua:256
+msgid "Wooden"
+msgstr ""
+
+#: gates.lua:268
+msgid "Steel"
+msgstr ""
+
 #: gate_slots.lua:36
 msgid "Stonebrick"
 msgstr "Mattoni di pietra"
@@ -248,27 +286,3 @@ msgstr "Alloggio di @1 per cancelli, porte, portoni e saracinesche"
 msgid "@1 Gate Slot Reverse"
 msgstr ""
 "Rovescio dell'alloggio di @1 per cancelli, porte, portoni e saracinesche."
-
-#: gates.lua:7
-msgid "Portcullis Bars"
-msgstr "Sbarre della saracinesca"
-
-#: gates.lua:37
-msgid "Portcullis Bottom"
-msgstr "Estremità inferiore della saracinesca"
-
-#: gates.lua:104
-msgid "Gate Door"
-msgstr "Segmento di cancello, porta o portone"
-
-#: gates.lua:136
-msgid "Gate Door Edge"
-msgstr "Estremità di cancello, porta o portone"
-
-#: gates.lua:175
-msgid "Gate Door With Handle"
-msgstr "Cancello, porta o portone con maniglia"
-
-#: gates.lua:218
-msgid "Gate Door With Hinge"
-msgstr "Cancello, porta o portone con cardine"
diff --git a/castle_gates/locale/template.pot b/castle_gates/locale/template.pot
index 2122c17..8a921e3 100644
--- a/castle_gates/locale/template.pot
+++ b/castle_gates/locale/template.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 23:41-0700\n"
+"POT-Creation-Date: 2019-04-14 22:15-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -157,46 +157,54 @@ msgstr ""
 msgid "Oak Door"
 msgstr ""
 
-#: doors.lua:22
+#: doors.lua:37
 msgid "Jail Door"
 msgstr ""
 
-#: doors.lua:43
+#: doors.lua:54
 msgid "Jail Bars"
 msgstr ""
 
-#: gate_slots.lua:36
-msgid "Stonebrick"
+#: gates.lua:23
+msgid "@1 Portcullis Bars"
 msgstr ""
 
-#: gate_slots.lua:45
-msgid "@1 Gate Slot"
+#: gates.lua:53
+msgid "@1 Portcullis Bottom"
 msgstr ""
 
-#: gate_slots.lua:70
-msgid "@1 Gate Slot Reverse"
+#: gates.lua:113
+msgid "@1 Gate Door"
+msgstr ""
+
+#: gates.lua:145
+msgid "@1 Gate Door Edge"
 msgstr ""
 
-#: gates.lua:7
-msgid "Portcullis Bars"
+#: gates.lua:184
+msgid "@1 Gate Door With Handle"
 msgstr ""
 
-#: gates.lua:37
-msgid "Portcullis Bottom"
+#: gates.lua:227
+msgid "@1 Gate Door With Hinge"
 msgstr ""
 
-#: gates.lua:104
-msgid "Gate Door"
+#: gates.lua:256
+msgid "Wooden"
 msgstr ""
 
-#: gates.lua:136
-msgid "Gate Door Edge"
+#: gates.lua:268
+msgid "Steel"
 msgstr ""
 
-#: gates.lua:175
-msgid "Gate Door With Handle"
+#: gate_slots.lua:36
+msgid "Stonebrick"
+msgstr ""
+
+#: gate_slots.lua:45
+msgid "@1 Gate Slot"
 msgstr ""
 
-#: gates.lua:218
-msgid "Gate Door With Hinge"
+#: gate_slots.lua:70
+msgid "@1 Gate Slot Reverse"
 msgstr ""
diff --git a/castle_gates/locale/update.bat b/castle_gates/locale/update.bat
new file mode 100644
index 0000000..e87d44c
--- /dev/null
+++ b/castle_gates/locale/update.bat
@@ -0,0 +1,6 @@
+@echo off
+setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
+cd ..
+set LIST=
+for /r %%X in (*.lua) do set LIST=!LIST! %%X
+..\intllib\tools\xgettext.bat %LIST%
\ No newline at end of file
diff --git a/caverealms/README.md b/caverealms/README.md
deleted file mode 100644
index 87edf5f..0000000
--- a/caverealms/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-minetest-caverealms
-===================
-
-A mod for Minetest to add underground realms
-
-For more information, view the official forum topic at:
-https://forum.minetest.net/viewtopic.php?f=9&t=9522
-
-Contributors:
-HeroOfTheWinds - everything
-|
-Zeno- - additional ideas and fine tuning
-
-Licensed under the WTFPL
diff --git a/caverealms/crafting.lua b/caverealms/crafting.lua
deleted file mode 100644
index e78da6e..0000000
--- a/caverealms/crafting.lua
+++ /dev/null
@@ -1,43 +0,0 @@
---CaveRealms crafting.lua
-
---CRAFT ITEMS--
-
---mycena powder
-minetest.register_craftitem("caverealms:mycena_powder", {
-	description = "Mycena Powder",
-	inventory_image = "caverealms_mycena_powder.png",
-})
-
---CRAFT RECIPES--
-
---mycena powder
-minetest.register_craft({
-	output = "caverealms:mycena_powder",
-	type = "shapeless",
-	recipe = {"caverealms:mycena"}
-})
-
-
---glow mese block
-minetest.register_craft({
-	output = "caverealms:glow_mese",
-	recipe = {
-		{"default:mese_crystal_fragment","default:mese_crystal_fragment","default:mese_crystal_fragment"},
-		{"default:mese_crystal_fragment","caverealms:mycena_powder","default:mese_crystal_fragment"},
-		{"default:mese_crystal_fragment","default:mese_crystal_fragment","default:mese_crystal_fragment"}
-	}
-})
-
---reverse craft for glow mese
-minetest.register_craft({
-	output = "default:mese_crystal_fragment 8",
-	type = "shapeless",
-	recipe = {"caverealms:glow_mese"}
-})
-
---thin ice to water
-minetest.register_craft({
-	output = "default:water_source",
-	type = "shapeless",
-	recipe = {"caverealms:thin_ice"}
-})
\ No newline at end of file
diff --git a/caverealms/depends.txt b/caverealms/depends.txt
deleted file mode 100644
index 331d858..0000000
--- a/caverealms/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff --git a/caverealms/falling_ice.lua b/caverealms/falling_ice.lua
deleted file mode 100644
index f1ea438..0000000
--- a/caverealms/falling_ice.lua
+++ /dev/null
@@ -1,210 +0,0 @@
--- CaveRealms: falling icicles
--- borrowed from base MineTest game's falling.lua
-
---
--- Falling ice
---
-
-minetest.register_entity("caverealms:falling_ice", {
-	initial_properties = {
-		physical = true,
-		collide_with_objects = false,
-		collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
-		visual = "wielditem",
-		textures = {},
-		visual_size = {x=0.667, y=0.667},
-	},
-
-	node = {},
-
-	set_node = function(self, node)
-		self.node = node
-		local stack = ItemStack(node.name)
-		local itemtable = stack:to_table()
-		local itemname = nil
-		if itemtable then
-			itemname = stack:to_table().name
-		end
-		local item_texture = nil
-		local item_type = ""
-		if minetest.registered_items[itemname] then
-			item_texture = minetest.registered_items[itemname].inventory_image
-			item_type = minetest.registered_items[itemname].type
-		end
-		prop = {
-			is_visible = true,
-			textures = {node.name},
-		}
-		self.object:set_properties(prop)
-	end,
-
-	get_staticdata = function(self)
-		return self.node.name
-	end,
-
-	on_activate = function(self, staticdata)
-		self.object:set_armor_groups({immortal=1})
-		--self.object:setacceleration({x=0, y=-10, z=0})
-		self:set_node({name=staticdata})
-	end,
-
-	on_step = function(self, dtime)
-		-- Set gravity
-		self.object:setacceleration({x=0, y=-10, z=0})
-		-- Destroy when collides to ground or just move
-		local pos = self.object:getpos()
-		local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point
-		local bcn = minetest.get_node(bcp)
-		local bcd = minetest.registered_nodes[bcn.name]
-		--check for players next to this and hurt them >:D
-		local all_objects = minetest.get_objects_inside_radius(pos, 1)
-		local _,obj
-		for _,obj in ipairs(all_objects) do
-			if obj:is_player() then
-				obj:set_hp(obj:get_hp() - 8)
-			end
-		end
-		-- Note: walkable is in the node definition, not in item groups
-		if not bcd or
-				(bcd.walkable or
-				(minetest.get_item_group(self.node.name, "float") ~= 0 and
-				bcd.liquidtype ~= "none")) then
-			if bcd and bcd.leveled and
-					bcn.name == self.node.name then
-				local addlevel = self.node.level
-				if addlevel == nil or addlevel <= 0 then
-					addlevel = bcd.leveled
-				end
-				if minetest.add_node_level(bcp, addlevel) == 0 then
-					self.object:remove()
-					return
-				end
-			elseif bcd and bcd.buildable_to and
-					(minetest.get_item_group(self.node.name, "float") == 0 or
-					bcd.liquidtype == "none") then
-				minetest.remove_node(bcp)
-				return
-			end
-			local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
-			-- Check what's here
-			local n2 = minetest.get_node(np)
-			-- remove node and replace it with it's drops
-			local drops = minetest.get_node_drops(n2.name, "")
-			minetest.remove_node(np)
-			local _, dropped_item
-			for _, dropped_item in ipairs(drops) do
-				minetest.add_item(np, dropped_item)
-			end
-			-- Run script hook
-			local _, callback
-			for _, callback in ipairs(minetest.registered_on_dignodes) do
-				callback(np, n2, nil)
-			end
-			-- remove entity
-			--minetest.add_node(np, self.node)
-			self.object:remove()
-			caverealms:nodeupdate(np)
-		else
-			-- Do nothing
-		end
-	end
-})
-
-function caverealms:spawn_falling_node(p, node)
-	obj = minetest.add_entity(p, "caverealms:falling_ice")
-	obj:get_luaentity():set_node(node)
-end
-
-function caverealms:drop_attached_node(p)
-	local nn = minetest.get_node(p).name
-	minetest.remove_node(p)
-	for _,item in ipairs(minetest.get_node_drops(nn, "")) do
-		local pos = {
-			x = p.x + math.random()/2 - 0.25,
-			y = p.y + math.random()/2 - 0.25,
-			z = p.z + math.random()/2 - 0.25,
-		}
-		minetest.add_item(pos, item)
-	end
-end
-
-function caverealms:check_attached_node(p, n)
-	local def = minetest.registered_nodes[n.name]
-	local d = {x=0, y=0, z=0}
-	if def.paramtype2 == "wallmounted" then
-		if n.param2 == 0 then
-			d.y = 1
-		elseif n.param2 == 1 then
-			d.y = -1
-		elseif n.param2 == 2 then
-			d.x = 1
-		elseif n.param2 == 3 then
-			d.x = -1
-		elseif n.param2 == 4 then
-			d.z = 1
-		elseif n.param2 == 5 then
-			d.z = -1
-		end
-	else
-		d.y = -1
-	end
-	local p2 = {x=p.x+d.x, y=p.y+d.y, z=p.z+d.z}
-	local nn = minetest.get_node(p2).name
-	local def2 = minetest.registered_nodes[nn]
-	if def2 and not def2.walkable then
-		return false
-	end
-	return true
-end
-
---
--- Some common functions
---
-
-function caverealms:nodeupdate_single(p, delay)
-	n = minetest.get_node(p)
-	if minetest.get_item_group(n.name, "falling_node") ~= 0 then
-		p_bottom = {x=p.x, y=p.y-1, z=p.z}
-		n_bottom = minetest.get_node(p_bottom)
-		-- Note: walkable is in the node definition, not in item groups
-		if minetest.registered_nodes[n_bottom.name] and
-				(minetest.get_item_group(n.name, "float") == 0 or
-					minetest.registered_nodes[n_bottom.name].liquidtype == "none") and
-				(n.name ~= n_bottom.name or (minetest.registered_nodes[n_bottom.name].leveled and
-					minetest.get_node_level(p_bottom) < minetest.get_node_max_level(p_bottom))) and
-				(not minetest.registered_nodes[n_bottom.name].walkable or
-					minetest.registered_nodes[n_bottom.name].buildable_to) then
-			if delay then
-				minetest.after(0.1, caverealms.nodeupdate_single, {x=p.x, y=p.y, z=p.z}, false)
-			else
-				n.level = minetest.get_node_level(p)
-				minetest.remove_node(p)
-				caverealms:spawn_falling_node(p, n)
-				caverealms:nodeupdate(p)
-			end
-		end
-	end
-
-	if minetest.get_item_group(n.name, "attached_node") ~= 0 then
-		if not caverealms:check_attached_node(p, n) then
-			caverealms:drop_attached_node(p)
-			caverealms:nodeupdate(p)
-		end
-	end
-end
-
-function caverealms:nodeupdate(p, delay)
-	-- Round p to prevent falling entities to get stuck
-	p.x = math.floor(p.x+0.5)
-	p.y = math.floor(p.y+0.5)
-	p.z = math.floor(p.z+0.5)
-
-	for x = -1,1 do
-	for y = -1,1 do
-	for z = -1,1 do
-		caverealms:nodeupdate_single({x=p.x+x, y=p.y+y, z=p.z+z}, delay or not (x==0 and y==0 and z==0))
-	end
-	end
-	end
-end
-
diff --git a/caverealms/nodes.lua b/caverealms/nodes.lua
deleted file mode 100644
index 5292eea..0000000
--- a/caverealms/nodes.lua
+++ /dev/null
@@ -1,351 +0,0 @@
--- CaveRealms nodes.lua
-
---NODES--
-
-local FALLING_ICICLES = caverealms.config.falling_icicles --true --toggle to turn on or off falling icicles in glaciated biome
-local FALLCHA = caverealms.config.fallcha --0.33 --chance of causing the structure to fall
-
-
---glowing crystal
-minetest.register_node("caverealms:glow_crystal", {
-	description = "Glow Crystal",
-	tiles = {"caverealms_glow_crystal.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_glass_defaults(),
-	light_source = 13,
-	paramtype = "light",
-	use_texture_alpha = true,
-	drawtype = "glasslike",
-	sunlight_propagates = true,
-})
-
---glowing emerald
-minetest.register_node("caverealms:glow_emerald", {
-	description = "Glow Emerald",
-	tiles = {"caverealms_glow_emerald.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_glass_defaults(),
-	light_source = 13,
-	paramtype = "light",
-	use_texture_alpha = true,
-	drawtype = "glasslike",
-	sunlight_propagates = true,
-})
-
---glowing mese crystal blocks
-minetest.register_node("caverealms:glow_mese", {
-	description = "Mese Crystal Block",
-	tiles = {"caverealms_glow_mese.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_glass_defaults(),
-	light_source = 13,
-	paramtype = "light",
-	use_texture_alpha = true,
-	drawtype = "glasslike",
-	sunlight_propagates = true,
-})
-
---embedded crystal
-minetest.register_node("caverealms:glow_ore", {
-	description = "Glow Crystal Ore",
-	tiles = {"caverealms_glow_ore.png"},
-	is_ground_content = true,
-	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
-	light_source = 12,
-	paramtype = "light",
-})
-
---embedded emerald
-minetest.register_node("caverealms:glow_emerald_ore", {
-	description = "Glow Emerald Ore",
-	tiles = {"caverealms_glow_emerald_ore.png"},
-	is_ground_content = true,
-	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
-	light_source = 12,
-	paramtype = "light",
-})
-
---thin (transparent) ice
-minetest.register_node("caverealms:thin_ice", {
-	description = "Thin Ice",
-	tiles = {"caverealms_thin_ice.png"},
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_glass_defaults(),
-	use_texture_alpha = true,
-	drawtype = "glasslike",
-	sunlight_propagates = true,
-	freezemelt = "default:water_source",
-	paramtype = "light",
-})
-
---alternate version for stalactites
-minetest.register_node("caverealms:hanging_thin_ice", {
-	description = "Thin Ice (hanging)",
-	tiles = {"caverealms_thin_ice.png"},
-	is_ground_content = true,
-	groups = {cracky=3, not_in_creative_inventory = 1},
-	sounds = default.node_sound_glass_defaults(),
-	use_texture_alpha = true,
-	drawtype = "glasslike",
-	sunlight_propagates = true,
-	drop = "caverealms:thin_ice",
-	freezemelt = "default:water_flowing",
-	paramtype = "light",
-	after_dig_node = function(pos, oldnode, oldmetadata, digger)
-		if FALLING_ICICLES then
-			if math.random() <= FALLCHA then
-				obj = minetest.add_entity(pos, "caverealms:falling_ice")
-				obj:get_luaentity():set_node(oldnode)
-				for y = -13, 13 do
-					for x = -3, 3 do
-					for z = -3, 3 do
-						local npos = {x=pos.x+x, y=pos.y+y, z=pos.z+z}
-						if minetest.get_node(npos).name == "caverealms:hanging_thin_ice" then
-							nobj = minetest.add_entity(npos, "caverealms:falling_ice")
-							nobj:get_luaentity():set_node(oldnode)
-							minetest.remove_node(npos)
-						end
-					end
-					end
-				end
-				minetest.remove_node(pos)
-			else
-				return 1
-			end
-		else
-			return 1
-		end
-	end,
-})
-
---glowing crystal gem
-local glow_gem_size = { 1.0, 1.2, 1.4, 1.6, 1.7 }
-
-for i in ipairs(glow_gem_size) do
-	if i == 1 then
-		nodename = "caverealms:glow_gem"
-	else
-		nodename = "caverealms:glow_gem_"..i
-	end
-
-	vs = glow_gem_size[i]
-
-	minetest.register_node(nodename, {
-		description = "Glow Gem",
-		tiles = {"caverealms_glow_gem.png"},
-		inventory_image = "caverealms_glow_gem.png",
-		wield_image = "caverealms_glow_gem.png",
-		is_ground_content = true,
-		groups = {cracky=3, oddly_breakable_by_hand=1},
-		sounds = default.node_sound_glass_defaults(),
-		light_source = 12,
-		paramtype = "light",
-		drawtype = "plantlike",
-		walkable = false,
-		buildable_to = true,
-		visual_scale = vs,
-		selection_box = {
-			type = "fixed",
-			fixed = {-0.5*vs, -0.5*vs, -0.5*vs, 0.5*vs, -5/16*vs, 0.5*vs},
-		}
-	})
-end
-
---upward pointing icicle
-minetest.register_node("caverealms:icicle_up", {
-	description = "Icicle",
-	tiles = {"caverealms_icicle_up.png"},
-	inventory_image = "caverealms_icicle_up.png",
-	wield_image = "caverealms_icicle_up.png",
-	is_ground_content = true,
-	groups = {cracky=3, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults(),
-	light_source = 8,
-	paramtype = "light",
-	drawtype = "plantlike",
-	walkable = false,
-	buildable_to = true,
-	visual_scale = 1.0,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-})
-
---downward pointing icicle
-minetest.register_node("caverealms:icicle_down", {
-	description = "Icicle",
-	tiles = {"caverealms_icicle_down.png"},
-	inventory_image = "caverealms_icicle_down.png",
-	wield_image = "caverealms_icicle_down.png",
-	is_ground_content = true,
-	groups = {cracky=3, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults(),
-	light_source = 8,
-	paramtype = "light",
-	drawtype = "plantlike",
-	walkable = false,
-	buildable_to = true,
-	visual_scale = 1.0,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-})
-
---cave mossy cobble - bluish?
-minetest.register_node("caverealms:stone_with_moss", {
-	description = "Cave Stone with Moss",
-	tiles = {"default_cobble.png^caverealms_moss.png", "default_cobble.png", "default_cobble.png^caverealms_moss_side.png"},
-	is_ground_content = true,
-	groups = {crumbly=3, soil=1},
-	drop = 'default:cobble',
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_grass_footstep", gain=0.25},
-	}),
-})
-
---cave lichen-covered cobble - purple-ish
-minetest.register_node("caverealms:stone_with_lichen", {
-	description = "Cave Stone with Lichen",
-	tiles = {"default_cobble.png^caverealms_lichen.png", "default_cobble.png", "default_cobble.png^caverealms_lichen_side.png"},
-	is_ground_content = true,
-	groups = {crumbly=3, soil=1},
-	drop = 'default:cobble',
-	light_source = 2,
-	paramtype = "light",
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_grass_footstep", gain=0.25},
-	}),
-})
-
---cave algae-covered cobble - yellow-ish
-minetest.register_node("caverealms:stone_with_algae", {
-	description = "Cave Stone with Algae",
-	tiles = {"default_cobble.png^caverealms_algae.png", "default_cobble.png", "default_cobble.png^caverealms_algae_side.png"},
-	is_ground_content = true,
-	groups = {crumbly=3, soil=1},
-	light_source = 2,
-	paramtype = "light",
-	drop = 'default:cobble',
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_grass_footstep", gain=0.25},
-	}),
-})
-
---glow worms
-minetest.register_node("caverealms:glow_worm", {
-	description = "Glow Worms",
-	tiles = {"caverealms_glow_worm.png"},
-	inventory_image = "caverealms_glow_worm.png",
-	wield_image = "caverealms_glow_worm.png",
-	is_ground_content = true,
-	groups = {oddly_breakable_by_hand=3},
-	light_source = 9,
-	paramtype = "light",
-	drawtype = "plantlike",
-	walkable = false,
-	buildable_to = true,
-	visual_scale = 1.0,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -0.5, 0.5},
-	},
-})
-
---cave plants go here
-
---glowing fungi
-minetest.register_node("caverealms:fungus", {
-	description = "Glowing Fungus",
-	tiles = {"caverealms_fungi.png"},
-	inventory_image = "caverealms_fungi.png",
-	wield_image = "caverealms_fungi.png",
-	is_ground_content = true,
-	groups = {oddly_breakable_by_hand=3},
-	light_source = 5,
-	paramtype = "light",
-	drawtype = "plantlike",
-	walkable = false,
-	buildable_to = true,
-	visual_scale = 1.0,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-})
-
---mycena mushroom
-minetest.register_node("caverealms:mycena", {
-	description = "Mycena Mushroom",
-	tiles = {"caverealms_mycena.png"},
-	inventory_image = "caverealms_mycena.png",
-	wield_image = "caverealms_mycena.png",
-	is_ground_content = true,
-	groups = {oddly_breakable_by_hand=3},
-	light_source = 8,
-	paramtype = "light",
-	drawtype = "plantlike",
-	walkable = false,
-	buildable_to = true,
-	visual_scale = 1.0,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-	},
-})
-
---giant mushroom
---stem
-minetest.register_node("caverealms:mushroom_stem", {
-	description = "Giant Mushroom Stem",
-	tiles = {"caverealms_mushroom_stem.png"},
-	is_ground_content = true,
-	groups = {oddly_breakable_by_hand=1},
-})
-
---cap
-minetest.register_node("caverealms:mushroom_cap", {
-	description = "Giant Mushroom Cap",
-	tiles = {"caverealms_mushroom_cap.png"},
-	is_ground_content = true,
-	groups = {oddly_breakable_by_hand=1},
-})
-
---gills
-minetest.register_node("caverealms:mushroom_gills", {
-	description = "Giant Mushroom Gills",
-	tiles = {"caverealms_mushroom_gills.png"},
-	is_ground_content = true,
-	groups = {oddly_breakable_by_hand=1},
-	drawtype = "plantlike",
-	paramtype = "light",
-})
-
-local obsidian_glow = {7, 5, 2, 0}
-
-for i in ipairs(obsidian_glow) do
-	if i == 1 then
-		nodename = "caverealms:obsidian"
-	else
-		nodename = "caverealms:obsidian_" .. i
-	end
-	minetest.register_node(nodename, {
-		description = "Obsidian",
-		tiles = {"default_obsidian.png"},
-		is_ground_content = true,
-		sounds = default.node_sound_stone_defaults(),
-		groups = {
-			cracky=1, level=2, not_in_creative_inventory = 1
-		},
-		light_source = obsidian_glow[i],
-		drop = "default:obsidian",
-		paramtype = "light",
-	})
-end
diff --git a/caverealms/textures/caverealms_algae.png b/caverealms/textures/caverealms_algae.png
deleted file mode 100644
index da130aa..0000000
--- a/caverealms/textures/caverealms_algae.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_algae_side.png b/caverealms/textures/caverealms_algae_side.png
deleted file mode 100644
index c857c65..0000000
--- a/caverealms/textures/caverealms_algae_side.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_fungi.png b/caverealms/textures/caverealms_fungi.png
deleted file mode 100644
index 2785308..0000000
--- a/caverealms/textures/caverealms_fungi.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_glow_crystal.png b/caverealms/textures/caverealms_glow_crystal.png
deleted file mode 100644
index 63ebb5c..0000000
--- a/caverealms/textures/caverealms_glow_crystal.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_glow_emerald.png b/caverealms/textures/caverealms_glow_emerald.png
deleted file mode 100644
index 6d5c157..0000000
--- a/caverealms/textures/caverealms_glow_emerald.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_glow_emerald_ore.png b/caverealms/textures/caverealms_glow_emerald_ore.png
deleted file mode 100644
index 0e008a7..0000000
--- a/caverealms/textures/caverealms_glow_emerald_ore.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_glow_gem.png b/caverealms/textures/caverealms_glow_gem.png
deleted file mode 100644
index a18de24..0000000
--- a/caverealms/textures/caverealms_glow_gem.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_glow_mese.png b/caverealms/textures/caverealms_glow_mese.png
deleted file mode 100644
index f48fbe0..0000000
--- a/caverealms/textures/caverealms_glow_mese.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_glow_ore.png b/caverealms/textures/caverealms_glow_ore.png
deleted file mode 100644
index 4ce9165..0000000
--- a/caverealms/textures/caverealms_glow_ore.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_glow_worm.png b/caverealms/textures/caverealms_glow_worm.png
deleted file mode 100644
index 37d8966..0000000
--- a/caverealms/textures/caverealms_glow_worm.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_icicle_down.png b/caverealms/textures/caverealms_icicle_down.png
deleted file mode 100644
index 2663c7a..0000000
--- a/caverealms/textures/caverealms_icicle_down.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_icicle_up.png b/caverealms/textures/caverealms_icicle_up.png
deleted file mode 100644
index ff9ee25..0000000
--- a/caverealms/textures/caverealms_icicle_up.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_lichen_side.png b/caverealms/textures/caverealms_lichen_side.png
deleted file mode 100644
index 024de44..0000000
--- a/caverealms/textures/caverealms_lichen_side.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_moss.png b/caverealms/textures/caverealms_moss.png
deleted file mode 100644
index 2d8a27b..0000000
--- a/caverealms/textures/caverealms_moss.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_moss_side.png b/caverealms/textures/caverealms_moss_side.png
deleted file mode 100644
index 277bb54..0000000
--- a/caverealms/textures/caverealms_moss_side.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_mushroom_cap.png b/caverealms/textures/caverealms_mushroom_cap.png
deleted file mode 100644
index 0514fff..0000000
--- a/caverealms/textures/caverealms_mushroom_cap.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_mushroom_cap_legacy.png b/caverealms/textures/caverealms_mushroom_cap_legacy.png
deleted file mode 100644
index 7967ee9..0000000
--- a/caverealms/textures/caverealms_mushroom_cap_legacy.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_mushroom_gills.png b/caverealms/textures/caverealms_mushroom_gills.png
deleted file mode 100644
index 92b28a8..0000000
--- a/caverealms/textures/caverealms_mushroom_gills.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_mushroom_stem.png b/caverealms/textures/caverealms_mushroom_stem.png
deleted file mode 100644
index d4e5601..0000000
--- a/caverealms/textures/caverealms_mushroom_stem.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_mycena.png b/caverealms/textures/caverealms_mycena.png
deleted file mode 100644
index 7ab3ad8..0000000
--- a/caverealms/textures/caverealms_mycena.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_mycena_powder.png b/caverealms/textures/caverealms_mycena_powder.png
deleted file mode 100644
index 22e3537..0000000
--- a/caverealms/textures/caverealms_mycena_powder.png
+++ /dev/null
diff --git a/caverealms/textures/caverealms_thin_ice.png b/caverealms/textures/caverealms_thin_ice.png
deleted file mode 100644
index 0d0820f..0000000
--- a/caverealms/textures/caverealms_thin_ice.png
+++ /dev/null
diff --git a/caverealms_lite/LICENSE.txt b/caverealms_lite/LICENSE.txt
new file mode 100644
index 0000000..6e9767f
--- /dev/null
+++ b/caverealms_lite/LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright (c) 2017, Craig Robbins and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
diff --git a/caverealms_lite/README.md b/caverealms_lite/README.md
new file mode 100644
index 0000000..4ab76b8
--- /dev/null
+++ b/caverealms_lite/README.md
@@ -0,0 +1,31 @@
+# caverealms-lite
+
+Based on the original minetest-caverealms mod (https://github.com/HeroOfTheWinds/minetest-caverealms/).
+
+Adds underground realms to minetest.
+
+This caverealms fork provides all the biomes and decorations from the original caverealms, with several additions and without the overhead of generating caves. This lowers the server resources the mod requires, for example CPU and RAM. This also removes the large lava spills created by the original caverealms.
+
+It is specifically written to work with the mgvalleys mapgen, but will work using other mapgens as well. The mapgen used will determine the shape and size of individual caves. Mapgens that generate only smaller caves may be less suitable for use with this fork than mgvalleys.   
+
+Note: For worlds where the original caverealms is already in use, this fork is not advised as a replacement. If used in this way, some unknown nodes and other minor issues should be expected.
+
+
+## License and Contributors
+
+Source code: FreeBSD License (Simplified)
+The original caverealms was licensed as WTFPL.
+
+Contributors:
+- Zeno, Shara RedCat - This rewrite
+- HeroOfTheWinds, Zeno - Original mod
+
+
+## Recommended Additions
+
+- VanessaE's HDX texturepacks provide alternative textures. For example,
+https://gitlab.com/VanessaE/hdx-128.
+- ethereal mod unlocks additional content (https://notabug.org/tenplus1/ethereal).
+- mobs_monster mod allows Dungeon Masters to spawn in the Dungeon Master's Lair biome (https://notabug.org/tenplus1/mobs_monster). 
+- mobs_redo is required to run mobs_monster (https://notabug.org/tenplus1/mobs_redo).
+- abritorch adds coloured torches made with caverealms items (https://github.com/Ezhh/abritorch).
diff --git a/caverealms/config.lua b/caverealms_lite/config.lua
index c4deaf2..a4c9a0f 100644
--- a/caverealms/config.lua
+++ b/caverealms_lite/config.lua
@@ -1,4 +1,3 @@
-
 local CONFIG_FILE_PREFIX = "caverealms."
 
 caverealms.config = {}
@@ -22,26 +21,33 @@ end
 
 --generation settings
 setting("number", "ymin", -33000) --bottom realm limit
-setting("number", "ymax", -700) --top realm limit
-setting("number", "tcave", 0.5) --cave threshold
-setting("number", "deepcaves_ymax", -10000) -- depth when deepcave biomes start
-setting("number", "deepdeepcaves_ymax", -20000)
-
---falling icicles
-setting("bool", "falling_icicles", true) --enable/disable falling icicles
-setting("number", "fallcha", 0.33) --chance of icicles falling when dug
+setting("number", "ymax", -1500) --top realm limit
+setting("number", "tcave", 0.75) --cave threshold
 
 --decoration chances
-setting("number", "stagcha", 0.002) --chance of stalagmites
+setting("number", "stagcha", 0.003) --chance of stalagmites
 setting("number", "stalcha", 0.003) --chance of stalactites
-setting("number", "h_lag", 15) --max height for stalagmites
-setting("number", "h_lac", 20) --...stalactites
-setting("number", "crystal", 0.007) --chance of glow crystal formations
-setting("number", "h_cry", 9) --max height of glow crystals
-setting("number", "h_clac", 13) --max height of glow crystal stalactites
+
+setting("number", "h_lag", 8) --max height for stalagmites
+setting("number", "h_lac", 8) --...stalactites
+setting("number", "crystal", 0.0002) --chance of glow crystal formations
+setting("number", "h_cry", 8) --max height of glow crystals
+setting("number", "h_clac", 8) --max height of glow crystal stalactites
+
 setting("number", "gemcha", 0.03) --chance of small glow gems
 setting("number", "mushcha", 0.04) --chance of mushrooms
 setting("number", "myccha", 0.03) --chance of mycena mushrooms
-setting("number", "wormcha", 0.02) --chance of glow worms
+setting("number", "wormcha", 0.015) --chance of glow worms
 setting("number", "giantcha", 0.001) --chance of giant mushrooms
 setting("number", "icicha", 0.035) --chance of icicles
+setting("number", "flacha", 0.04) --chance of constant flames
+
+--realm limits for Dungeon Masters' Lair
+setting("number", "dm_top", -14000) --upper limit
+setting("number", "dm_bot", -16000) --lower limit
+
+--should DMs spawn in DM Lair?
+setting("bool", "dm_spawn", true) 
+
+--Deep cave settings
+setting("number", "deep_cave", -7000) -- upper limit
diff --git a/caverealms_lite/crafting.lua b/caverealms_lite/crafting.lua
new file mode 100644
index 0000000..52da277
--- /dev/null
+++ b/caverealms_lite/crafting.lua
@@ -0,0 +1,145 @@
+--thin ice to water
+minetest.register_craft({
+	output = "default:water_source",
+	type = "shapeless",
+	recipe = {"caverealms:thin_ice"}
+})
+
+--use for coal dust
+minetest.register_craft({
+	output = "default:coalblock",
+	recipe = {
+		{"caverealms:coal_dust","caverealms:coal_dust","caverealms:coal_dust"},
+		{"caverealms:coal_dust","caverealms:coal_dust","caverealms:coal_dust"},
+		{"caverealms:coal_dust","caverealms:coal_dust","caverealms:coal_dust"}
+	}
+})
+
+-- DM statue
+minetest.register_craft({
+	output = "caverealms:dm_statue",
+	recipe = {
+		{"caverealms:glow_ore","caverealms:hot_cobble","caverealms:glow_ore"},
+		{"caverealms:hot_cobble","caverealms:hot_cobble","caverealms:hot_cobble"},
+		{"caverealms:hot_cobble","caverealms:hot_cobble","caverealms:hot_cobble"}
+	}
+})
+
+-- Glow obsidian brick
+minetest.register_craft({
+	output = "caverealms:glow_obsidian_brick 4",
+	recipe = {
+		{"caverealms:glow_obsidian", "caverealms:glow_obsidian"},
+		{"caverealms:glow_obsidian", "caverealms:glow_obsidian"}
+	}
+})
+
+minetest.register_craft({
+	output = "caverealms:glow_obsidian_brick_2 4",
+	recipe = {
+		{"caverealms:glow_obsidian_2", "caverealms:glow_obsidian_2"},
+		{"caverealms:glow_obsidian_2", "caverealms:glow_obsidian_2"}
+	}
+})
+
+-- Glow obsidian glass
+minetest.register_craft({
+	output = "caverealms:glow_obsidian_glass 5",
+	recipe = {
+		{"default:glass", "default:glass", "default:glass"},
+		{"default:glass", "default:glass", "caverealms:glow_obsidian"}
+	}
+})
+
+minetest.register_craft({
+	output = "caverealms:glow_obsidian_glass 5",
+	recipe = {
+		{"default:glass", "default:glass", "default:glass"},
+		{"default:glass", "default:glass", "caverealms:glow_obsidian_2"}
+	}
+})
+
+-- Requires ethereal:fish_raw
+if minetest.get_modpath("ethereal") then
+
+	-- Professional Fishing Rod
+	minetest.register_craftitem("caverealms:angler_rod", {
+		description = "Pro Fishing Rod",
+		inventory_image = "caverealms_angler_rod.png",
+		wield_image = "caverealms_angler_rod.png"
+	})
+
+	minetest.register_craft({
+		output = "caverealms:angler_rod",
+		recipe = {
+				{"","","default:steel_ingot"},
+				{"", "default:steel_ingot", "caverealms:mushroom_gills"},
+				{"default:steel_ingot", "", "caverealms:mushroom_gills"},
+			}
+	})
+
+	-- Glow Bait
+	minetest.register_craftitem("caverealms:glow_bait", {
+		description = "Glow Bait",
+		inventory_image = "caverealms_glow_bait.png",
+		wield_image = "caverealms_glow_bait.png",
+	})
+
+	minetest.register_craft({
+		output = "caverealms:glow_bait 9",
+		recipe = {
+				{"caverealms:glow_worm_green"},
+			}
+	})
+
+	-- default ethereal fish
+	local fish = {
+		{"ethereal:fish_raw"},
+	}
+
+	-- Pro Fishing Rod (Baited)
+	minetest.register_craftitem("caverealms:angler_rod_baited", {
+		description = "Baited Pro Fishing Rod",
+		inventory_image = "caverealms_angler_rod_baited.png",
+		wield_image = "caverealms_angler_rod_weild.png",
+		stack_max = 1,
+		liquids_pointable = true,
+
+		on_use = function (itemstack, user, pointed_thing)
+
+			if pointed_thing.type ~= "node" then
+				return
+			end
+
+			local node = minetest.get_node(pointed_thing.under).name
+
+			if (node == "default:water_source"
+			or node == "default:river_water_source")
+			and math.random(1, 100) < 35 then
+
+				local type = fish[math.random(1, #fish)][1]
+				local inv = user:get_inventory()
+
+				if inv:room_for_item("main", {name = type}) then
+
+					inv:add_item("main", {name = type})
+
+					if (math.random() < 0.6) then
+						return ItemStack("caverealms:angler_rod_baited")
+					else
+						return ItemStack("caverealms:angler_rod")
+					end
+				else
+					minetest.chat_send_player(user:get_player_name(),
+						"Inventory full, Fish Got Away!")
+				end
+			end
+		end,
+	})
+
+	minetest.register_craft({
+		type = "shapeless",
+		output = "caverealms:angler_rod_baited",
+		recipe = {"caverealms:angler_rod", "caverealms:glow_bait"},
+	})
+end
diff --git a/caverealms_lite/depends.txt b/caverealms_lite/depends.txt
new file mode 100644
index 0000000..3ad2748
--- /dev/null
+++ b/caverealms_lite/depends.txt
@@ -0,0 +1,4 @@
+default
+stairs
+ethereal?
+mobs?
\ No newline at end of file
diff --git a/caverealms_lite/description.txt b/caverealms_lite/description.txt
new file mode 100644
index 0000000..2358750
--- /dev/null
+++ b/caverealms_lite/description.txt
@@ -0,0 +1 @@
+A mod for Minetest to add underground realms.
diff --git a/caverealms_lite/docs/caverealms_lite_biomes.txt b/caverealms_lite/docs/caverealms_lite_biomes.txt
new file mode 100644
index 0000000..d1591ee
--- /dev/null
+++ b/caverealms_lite/docs/caverealms_lite_biomes.txt
@@ -0,0 +1,19 @@
+Biome #, Biome name, "floor node"
+
+
+0, None
+1, Moss,             "caverealms:stone_with_moss"
+2, Fungal,           "caverealms:stone_with_lichen"
+3, Algae,            "caverealms:stone_with_algae"
+4, Glaciated,        "caverealms:thin_ice"
+
+The following are "deep realms"
+
+5, Deep Glaciated,   "default:ice"
+6, DM,               "caverealms:hot_cobble"
+7, Salt Crystal,     "caverealms:stone_with_salt"
+8, Glow Obsidian,    "caverealms:glow_obsidian"
+                         OR "caverealms:glow_obsidian2"
+9, Coal,             "default:coalblock"
+                         OR "caverealms:coal_dust"
+                         OR "default:desert_sand"
diff --git a/caverealms_lite/dungeon_master.lua b/caverealms_lite/dungeon_master.lua
new file mode 100644
index 0000000..e93ea8c
--- /dev/null
+++ b/caverealms_lite/dungeon_master.lua
@@ -0,0 +1,16 @@
+mobs:spawn({
+	name = "mobs_monster:dungeon_master",
+	nodes = {"caverealms:hot_cobble"},
+	max_light = 12,
+	min_light = 0,
+	chance = 7000,
+	active_object_count = 2,
+	max_height = -8000,
+	on_spawn = function(self, pos)
+		self.hp_max = 70
+		self.health = 70
+		self.damage = 5
+		self.shoot_interval = 1.5
+		self.dogshoot_switch = 0
+	end
+})
diff --git a/caverealms/functions.lua b/caverealms_lite/functions.lua
index 17beda7..2be9e10 100644
--- a/caverealms/functions.lua
+++ b/caverealms_lite/functions.lua
@@ -1,7 +1,3 @@
---CaveRealms functions.lua
-
---FUNCTIONS--
-
 local H_LAG = caverealms.config.h_lag --15 --max height for stalagmites
 local H_LAC = caverealms.config.h_lac --20 --...stalactites
 local H_CRY = caverealms.config.h_cry --9 --max height of glow crystals
@@ -9,6 +5,7 @@ local H_CLAC = caverealms.config.h_clac --13 --max height of glow crystal stalac
 
 function caverealms:above_solid(x,y,z,area,data)
 	local c_air = minetest.get_content_id("air")
+
 	local ai = area:index(x,y+1,z-3)
 	if data[ai] == c_air then
 		return false
@@ -16,8 +13,10 @@ function caverealms:above_solid(x,y,z,area,data)
 		return true
 	end
 end
+
 function caverealms:below_solid(x,y,z,area,data)
 	local c_air = minetest.get_content_id("air")
+
 	local ai = area:index(x,y-1,z-3)
 	if data[ai] == c_air then
 		return false
@@ -117,15 +116,12 @@ function caverealms:crystal_stalagmite(x,y,z, area, data, biome)
 	local c_emore = minetest.get_content_id("caverealms:glow_emerald_ore")
 	local c_mesecry = minetest.get_content_id("caverealms:glow_mese")
 	local c_meseore = minetest.get_content_id("default:stone_with_mese")
+	local c_ruby = minetest.get_content_id("caverealms:glow_ruby")
+	local c_rubore = minetest.get_content_id("caverealms:glow_ruby_ore")
+	local c_ameth = minetest.get_content_id("caverealms:glow_amethyst")
+	local c_amethore = minetest.get_content_id("caverealms:glow_amethyst_ore")
 	local c_ice = minetest.get_content_id("default:ice")
 	local c_thinice = minetest.get_content_id("caverealms:thin_ice")
-	local c_obsidian = {
-		minetest.get_content_id("caverealms:obsidian"),
-		minetest.get_content_id("caverealms:obsidian_2"),
-		minetest.get_content_id("caverealms:obsidian_3"),
-		minetest.get_content_id("caverealms:obsidian_4"),
-	}
-	local c_embers = minetest.get_content_id("fake_fire:embers");
 
 	--for randomness
 	local mode = 1
@@ -139,7 +135,7 @@ function caverealms:crystal_stalagmite(x,y,z, area, data, biome)
 			mode = 1
 		end
 	end
-	if biome > 4 then
+	if biome == 4 or biome == 5 then
 		if math.random(3) == 1 then
 			mode = 2
 		end
@@ -149,40 +145,34 @@ function caverealms:crystal_stalagmite(x,y,z, area, data, biome)
  		{ {c_crystore, c_crystal}, {c_emore, c_emerald} },
  		{ {c_emore, c_emerald}, {c_crystore, c_crystal} },
  		{ {c_emore, c_emerald}, {c_meseore, c_mesecry} },
- 		{ {c_ice, c_thinice}, {c_crystore, c_crystal}}
+ 		{ {c_ice, c_thinice}, {c_crystore, c_crystal}},
+		{ {c_ice, c_thinice}, {c_crystore, c_crystal}},
+		{ {c_rubore, c_ruby}, {c_meseore, c_mesecry}},
+		{ {c_crystore, c_crystal}, {c_rubore, c_ruby} },
+		{ {c_rubore, c_ruby}, {c_emore, c_emerald}},
+		{ {c_amethore, c_ameth}, {c_meseore, c_mesecry} },
  	}
 
  	local nid_a
  	local nid_b
 	local nid_s = c_stone --stone base, will be rewritten to ice in certain biomes
 
-	local hell = false
-
- 	if biome > 3 then
-		if biome == 6 then
-			nid_s = c_obsidian[math.random(1, #c_obsidian)]
-			biome = 1
-			hell = true
+ 	if biome > 3 and biome < 6 then
+ 		if mode == 1 then
+ 			nid_a = c_ice
+			nid_b = c_thinice
+			nid_s = c_ice
  		else
-			if mode == 1 then
-				nid_s = c_ice
-			end
-			biome = 4
-		end
-	end
-
-	if (hell) then
-		nid_a = c_embers
-		nid_b = c_embers
-	else
-		if mode == 1 then
-			nid_a = stalids[biome][1][1]
-			nid_b = stalids[biome][1][2]
-		else
-			nid_a = stalids[biome][2][1]
-			nid_b = stalids[biome][2][2]
-		end
-	end
+ 			nid_a = c_crystore
+			nid_b = c_crystal
+ 		end
+ 	elseif mode == 1 then
+ 		nid_a = stalids[biome][1][1]
+ 		nid_b = stalids[biome][1][2]
+ 	else
+ 		nid_a = stalids[biome][2][1]
+ 		nid_b = stalids[biome][2][2]
+ 	end
 
 	local top = math.random(5,H_CRY) --grab a random height for the stalagmite
 	for j = 0, top do --y
@@ -227,15 +217,12 @@ function caverealms:crystal_stalactite(x,y,z, area, data, biome)
 	local c_emore = minetest.get_content_id("caverealms:glow_emerald_ore")
 	local c_mesecry = minetest.get_content_id("caverealms:glow_mese")
 	local c_meseore = minetest.get_content_id("default:stone_with_mese")
+	local c_ruby = minetest.get_content_id("caverealms:glow_ruby")
+	local c_rubore = minetest.get_content_id("caverealms:glow_ruby_ore")
+	local c_ameth = minetest.get_content_id("caverealms:glow_amethyst")
+	local c_amethore = minetest.get_content_id("caverealms:glow_amethyst_ore")
 	local c_ice = minetest.get_content_id("default:ice")
 	local c_thinice = minetest.get_content_id("caverealms:hanging_thin_ice")
-	local c_obsidian = {
-		minetest.get_content_id("caverealms:obsidian"),
-		minetest.get_content_id("caverealms:obsidian_2"),
-		minetest.get_content_id("caverealms:obsidian_3"),
-		minetest.get_content_id("caverealms:obsidian_4"),
-		minetest.get_content_id("caverealms:obsidian_5"),
-	}
 
 	--for randomness
 	local mode = 1
@@ -259,26 +246,28 @@ function caverealms:crystal_stalactite(x,y,z, area, data, biome)
  		{ {c_crystore, c_crystal}, {c_emore, c_emerald} },
  		{ {c_emore, c_emerald}, {c_crystore, c_crystal} },
  		{ {c_emore, c_emerald}, {c_meseore, c_mesecry} },
- 		{ {c_ice, c_thinice}, {c_crystore, c_crystal}}
+ 		{ {c_ice, c_thinice}, {c_crystore, c_crystal}},
+		{ {c_ice, c_thinice}, {c_crystore, c_crystal}},
+		{ {c_rubore, c_ruby}, {c_meseore, c_mesecry}},
+		{ {c_crystore, c_crystal}, {c_rubore, c_ruby} },
+		{ {c_rubore, c_ruby}, {c_emore, c_emerald}},
+		{ {c_amethore, c_ameth}, {c_meseore, c_mesecry} },
  	}
 
  	local nid_a
  	local nid_b
 	local nid_s = c_stone --stone base, will be rewritten to ice in certain biomes
 
- 	if biome > 3 then
-		if biome == 6 then
-			nid_s = c_obsidian[math.random(1, #c_obsidian)]
-			biome = 1
+ 	if biome > 3 and biome < 6 then
+ 		if mode == 1 then
+ 			nid_a = c_ice
+			nid_b = c_thinice
+			nid_s = c_ice
  		else
-			if mode == 1 then
-				nid_s = c_ice
-			end
-			biome = 4
-		end
-	end
-
- 	if mode == 1 then
+ 			nid_a = c_crystore
+			nid_b = c_crystal
+ 		end
+ 	elseif mode == 1 then
  		nid_a = stalids[biome][1][1]
  		nid_b = stalids[biome][1][2]
  	else
@@ -314,6 +303,51 @@ function caverealms:crystal_stalactite(x,y,z, area, data, biome)
 	end
 end
 
+--glowing crystal stalagmite spawner
+function caverealms:salt_stalagmite(x,y,z, area, data, biome)
+
+	if not caverealms:below_solid(x,y,z,area,data) then
+		return
+	end
+	
+	--contest ids
+	local c_stone = minetest.get_content_id("default:stone")
+	local c_salt = minetest.get_content_id("caverealms:salt_crystal")
+	
+	local scale = math.random(2, 4)
+	if scale == 2 then
+		for j = -3, 3 do
+			for k = -3, 3 do
+				local vi = area:index(x+j, y, z+k)
+				data[vi] = c_stone
+				if math.abs(j) ~= 3 and math.abs(k) ~= 3 then
+					local vi = area:index(x+j, y+1, z+k)
+					data[vi] = c_stone
+				end
+			end
+		end
+	else
+		for j = -4, 4 do
+			for k = -4, 4 do
+				local vi = area:index(x+j, y, z+k)
+				data[vi] = c_stone
+				if math.abs(j) ~= 4 and math.abs(k) ~= 4 then
+					local vi = area:index(x+j, y+1, z+k)
+					data[vi] = c_stone
+				end
+			end
+		end
+	end
+	for j = 2, scale + 2 do --y
+		for k = -2, scale - 2 do
+			for l = -2, scale - 2 do
+				local vi = area:index(x+k, y+j, z+l)
+				data[vi] = c_salt -- make cube
+			end
+		end
+	end
+end
+
 --function to create giant 'shrooms
 function caverealms:giant_shroom(x, y, z, area, data)
 
@@ -321,9 +355,18 @@ function caverealms:giant_shroom(x, y, z, area, data)
 		return
 	end
 
+	local c_cap
+	local c_stem
+
 	--as usual, grab the content ID's
-	local c_stem = minetest.get_content_id("caverealms:mushroom_stem")
-	local c_cap = minetest.get_content_id("caverealms:mushroom_cap")
+	if minetest.get_modpath("ethereal") then
+		c_stem = minetest.get_content_id("ethereal:mushroom_trunk")
+		c_cap = minetest.get_content_id("ethereal:mushroom")
+	else
+		c_stem = minetest.get_content_id("caverealms:mushroom_stem")
+		c_cap = minetest.get_content_id("caverealms:mushroom_cap")
+	end
+	
 	local c_gills = minetest.get_content_id("caverealms:mushroom_gills")
 
 	z = z - 5
@@ -364,43 +407,3 @@ function caverealms:giant_shroom(x, y, z, area, data)
 		end
 	end
 end
-
-function caverealms:legacy_giant_shroom(x, y, z, area, data) --leftovers :P
-	--as usual, grab the content ID's
-	local c_stem = minetest.get_content_id("caverealms:mushroom_stem")
-	local c_cap = minetest.get_content_id("caverealms:mushroom_cap")
-	
-	z = z - 4
-	--cap
-	for k = -4, 4 do
-	for l = -4, 4 do
-		if k*k + l*l <= 16 then
-			local vi = area:index(x+k, y+5, z+l)
-			data[vi] = c_cap
-		end
-		if k*k + l*l <= 9 then
-			local vi = area:index(x+k, y+4, z+l)
-			data[vi] = c_cap
-			vi = area:index(x+k, y+6, z+l)
-			data[vi] = c_cap
-		end
-		if k*k + l*l <= 4 then
-			local vi = area:index(x+k, y+7, z+l)
-			data[vi] = c_cap
-		end
-	end
-	end
-	--stem
-	for j = 0, 4 do
-		for k = -1,1 do
-			local vi = area:index(x+k, y+j, z)
-			data[vi] = c_stem
-			if k == 0 then
-				local ai = area:index(x, y+j, z+1)
-				data[ai] = c_stem
-				ai = area:index(x, y+j, z-1)
-				data[ai] = c_stem
-			end
-		end
-	end
-end
diff --git a/caverealms/init.lua b/caverealms_lite/init.lua
index f3b968a..5cc8a2c 100644
--- a/caverealms/init.lua
+++ b/caverealms_lite/init.lua
@@ -1,10 +1,3 @@
--- caverealms v.0.3 by HeroOfTheWinds
--- original cave code modified from paramat's subterrain
--- For Minetest 0.4.8 stable
--- Depends default
--- License: code WTFPL
-
-
 caverealms = {} --create a container for functions and constants
 
 --grab a shorthand for the filepath of the mod
@@ -15,18 +8,18 @@ dofile(modpath.."/config.lua") --configuration file; holds various constants
 dofile(modpath.."/crafting.lua") --crafting recipes
 dofile(modpath.."/nodes.lua") --node definitions
 dofile(modpath.."/functions.lua") --function definitions
+dofile(modpath.."/plants.lua")
 
-if caverealms.config.falling_icicles == true then
-	dofile(modpath.."/falling_ice.lua") --complicated function for falling icicles
-	print("[caverealms] falling icicles enabled.")
+if minetest.get_modpath("mobs_monster") then
+	if caverealms.config.dm_spawn == true then
+		dofile(modpath.."/dungeon_master.lua") --special DMs for DM's Lair biome
+	end
 end
 
 -- Parameters
 
 local YMIN = caverealms.config.ymin -- Approximate realm limits.
 local YMAX = caverealms.config.ymax
-local DEEPCAVES_YMAX = caverealms.config.deepcaves_ymax
-local DEEP_DEEP_CAVES_YMAZ = caverealms.config.deepdeepcaves_ymax
 local TCAVE = caverealms.config.tcave --0.5 -- Cave threshold. 1 = small rare caves, 0.5 = 1/3rd ground volume, 0 = 1/2 ground volume
 local BLEND = 128 -- Cave blend distance near YMIN, YMAX
 
@@ -39,35 +32,18 @@ local MYCCHA = caverealms.config.myccha --0.03 --chance of mycena mushrooms
 local WORMCHA = caverealms.config.wormcha --0.03 --chance of glow worms
 local GIANTCHA = caverealms.config.giantcha --0.001 -- chance of giant mushrooms
 local ICICHA = caverealms.config.icicha --0.035 -- chance of icicles
+local FLACHA = caverealms.config.flacha --0.04 --chance of constant flames
 
--- 3D noise for caves
-
-local np_cave = {
-	offset = 0,
-	scale = 1,
-	spread = {x=512, y=256, z=512}, -- squashed 2:1
-	seed = 59033,
-	octaves = 6,
-	persist = 0.63
-}
-
--- 3D noise for wave
-
-local np_wave = {
-	offset = 0,
-	scale = 1,
-	spread = {x=256, y=256, z=256},
-	seed = -400000000089,
-	octaves = 3,
-	persist = 0.67
-}
+local DM_TOP = caverealms.config.dm_top -- -4000 --level at which Dungeon Master Realms start to appear
+local DM_BOT = caverealms.config.dm_bot -- -5000 --level at which "" ends
+local DEEP_CAVE = caverealms.config.deep_cave -- -7000 --level at which deep cave biomes take over
 
 -- 2D noise for biome
 
 local np_biome = {
 	offset = 0,
 	scale = 1,
-	spread = {x=250, y=250, z=250},
+	spread = {x=200, y=200, z=200},
 	seed = 9130,
 	octaves = 3,
 	persist = 0.5
@@ -77,8 +53,6 @@ local np_biome = {
 
 subterrain = {}
 
-local yblmin = YMIN + BLEND * 1.5
-local yblmax = YMAX - BLEND * 1.5
 
 -- On generated function
 
@@ -89,180 +63,150 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	end
 
 	--easy reference to commonly used values
-	--local t1 = os.clock()
+	local t1 = os.clock()
 	local x1 = maxp.x
 	local y1 = maxp.y
 	local z1 = maxp.z
 	local x0 = minp.x
 	local y0 = minp.y
 	local z0 = minp.z
-
+	
 	--print ("[caverealms] chunk minp ("..x0.." "..y0.." "..z0..")") --tell people you are generating a chunk
-
+	
 	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
 	local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax}
 	local data = vm:get_data()
-
+	
 	--grab content IDs
 	local c_air = minetest.get_content_id("air")
 	local c_stone = minetest.get_content_id("default:stone")
+	
 	local c_water = minetest.get_content_id("default:water_source")
 	local c_lava = minetest.get_content_id("default:lava_source")
-	local c_lava_flowing = minetest.get_content_id("default:lava_flowing")
 	local c_ice = minetest.get_content_id("default:ice")
 	local c_thinice = minetest.get_content_id("caverealms:thin_ice")
 	local c_crystal = minetest.get_content_id("caverealms:glow_crystal")
-	local c_gem1 = minetest.get_content_id("caverealms:glow_gem")
-	local c_gem2 = minetest.get_content_id("caverealms:glow_gem_2")
-	local c_gem3 = minetest.get_content_id("caverealms:glow_gem_3")
-	local c_gem4 = minetest.get_content_id("caverealms:glow_gem_4")
-	local c_gem5 = minetest.get_content_id("caverealms:glow_gem_5")
+	local c_gem = minetest.get_content_id("caverealms:glow_gem")
+	local c_saltgem = minetest.get_content_id("caverealms:salt_gem")
+	local c_spike = minetest.get_content_id("caverealms:spike")
 	local c_moss = minetest.get_content_id("caverealms:stone_with_moss")
 	local c_lichen = minetest.get_content_id("caverealms:stone_with_lichen")
 	local c_algae = minetest.get_content_id("caverealms:stone_with_algae")
+	local c_salt = minetest.get_content_id("caverealms:stone_with_salt")
+	local c_hcobble = minetest.get_content_id("caverealms:hot_cobble")
+	local c_gobsidian = minetest.get_content_id("caverealms:glow_obsidian")
+	local c_gobsidian2 = minetest.get_content_id("caverealms:glow_obsidian_2")
+	local c_coalblock = minetest.get_content_id("default:coalblock")
+	local c_desand = minetest.get_content_id("default:desert_sand")
+	local c_coaldust = minetest.get_content_id("caverealms:coal_dust")
 	local c_fungus = minetest.get_content_id("caverealms:fungus")
 	local c_mycena = minetest.get_content_id("caverealms:mycena")
 	local c_worm = minetest.get_content_id("caverealms:glow_worm")
+	local c_worm_green = minetest.get_content_id("caverealms:glow_worm_green")
+	local c_fire_vine = minetest.get_content_id("caverealms:fire_vine")
 	local c_iciu = minetest.get_content_id("caverealms:icicle_up")
 	local c_icid = minetest.get_content_id("caverealms:icicle_down")
-	local c_coal_block = minetest.get_content_id("default:coalblock")
-	local c_diamond_block = minetest.get_content_id("default:diamondblock")
-
-
-	local c_obsidian = {
-		minetest.get_content_id("caverealms:obsidian"),
-		minetest.get_content_id("caverealms:obsidian_2"),
-		minetest.get_content_id("caverealms:obsidian_3"),
-		minetest.get_content_id("caverealms:obsidian_4"),
-	}
-
-	local allow_deep_cave_biomes = false
-	if minp.y <= DEEPCAVES_YMAX then
-		allow_deep_cave_biomes = true
-	end
-
-	local c_hard_rock
-	if minetest.get_modpath("morestones") then
-		if (minp.y <= DEEP_DEEP_CAVES_YMAZ) then
-			c_hard_rock = minetest.get_content_id("morestones:travertine")
-		else
-			c_hard_rock = minetest.get_content_id("morestones:comendite")
-		end
-	elseif minetest.get_modpath("gloopblocks") then
-		c_hard_rock = minetest.get_content_id("default:basalt")
-	else
-		c_hard_rock = minetest.get_content_id("default:stone_with_diamond")
-	end
-
-
-	local deep_cave_shell_type = math.random()
-
+	local c_flame = minetest.get_content_id("caverealms:constant_flame")
+	
 	--mandatory values
 	local sidelen = x1 - x0 + 1 --length of a mapblock
 	local chulens = {x=sidelen, y=sidelen, z=sidelen} --table of chunk edges
+	local chulens2D = {x=sidelen, y=sidelen, z=1}
 	local minposxyz = {x=x0, y=y0, z=z0} --bottom corner
 	local minposxz = {x=x0, y=z0} --2D bottom corner
-
-	local nvals_cave = minetest.get_perlin_map(np_cave, chulens):get3dMap_flat(minposxyz) --cave noise for structure
-	local nvals_wave = minetest.get_perlin_map(np_wave, chulens):get3dMap_flat(minposxyz) --wavy structure of cavern ceilings and floors
-	local nvals_biome = minetest.get_perlin_map(np_biome, chulens):get2dMap_flat({x=x0+150, y=z0+50}) --2D noise for biomes (will be 3D humidity/temp later)
-
+	
+	local nvals_biome = minetest.get_perlin_map(np_biome, chulens2D):get2dMap_flat({x=x0+150, y=z0+50}) --2D noise for biomes (will be 3D humidity/temp later)
+	
 	local nixyz = 1 --3D node index
 	local nixz = 1 --2D node index
 	local nixyz2 = 1 --second 3D index for second loop
-
+	
 
 	for z = z0, z1 do -- for each xy plane progressing northwards
-		--structure loop
-		for y = y0, y1 do -- for each x row progressing upwards
-			local tcave --declare variable
-			--determine the overal cave threshold
-			if y < yblmin then
-				tcave = TCAVE + ((yblmin - y) / BLEND) ^ 2
-			elseif y > yblmax then
-				tcave = TCAVE + ((y - yblmax) / BLEND) ^ 2
-			else
-				tcave = TCAVE
-			end
-			local vi = area:index(x0, y, z) --current node index
-			for x = x0, x1 do -- for each node do
-				if (nvals_cave[nixyz] + nvals_wave[nixyz])/2 > tcave then --if node falls within cave threshold
-					data[vi] = c_air --hollow it out to make the cave
-				end
-				--increment indices
-				nixyz = nixyz + 1
-				vi = vi + 1
-			end
-		end
+		--increment indices
+		nixyz = nixyz + 1
+
 
 		--decoration loop
 		for y = y0, y1 do -- for each x row progressing upwards
-			local tcave --same as above
-			if y < yblmin then
-				tcave = TCAVE + ((yblmin - y) / BLEND) ^ 2
-			elseif y > yblmax then
-				tcave = TCAVE + ((y - yblmax) / BLEND) ^ 2
-			else
-				tcave = TCAVE
+		
+			local c_selected_worm = c_worm
+
+			local is_deep = false
+			if y < DEEP_CAVE then
+				is_deep = true
 			end
+		
+
 			local vi = area:index(x0, y, z)
 			for x = x0, x1 do -- for each node do
-
+				
 				--determine biome
-				local biome = false --preliminary declaration
-				n_biome = nvals_biome[nixz] --make an easier reference to the noise
+				local biome = 0 --preliminary declaration
+				local n_biome = nvals_biome[nixz] --make an easier reference to the noise
+
 				--compare noise values to determine a biome
-				if n_biome >= 0 and n_biome < 0.5 then
-					if allow_deep_cave_biomes then --and n_biome >= 0.25 then
-						biome = 6 -- obsidian
+				if n_biome <= -0.5 then
+					if is_deep and n_biome <= -0.25 then
+						biome = 8 --glow obsidian
+					else
+						biome = 2 --fungal
+						c_selected_worm = c_worm_green
+					end
+
+				elseif n_biome < 0 then
+						biome = 0 -- none
+
+				elseif n_biome < 0.5 then
+					if is_deep and n_biome <= 0.25 then
+						biome = 7 --salt crystal
 					else
 						biome = 1 --moss
 					end
-				elseif n_biome <= -0.5 then
-					biome = 2 --fungal
-				elseif n_biome >= 0.5 then
-					if n_biome >= 0.7 then
-						biome = 5 -- deep glaciated
+
+				elseif n_biome < 0.65 then
+					biome = 0
+
+				elseif n_biome < 0.85 then
+					if is_deep and n_biome <= 0.75 then
+						biome = 9 --coal dust
 					else
-						biome = 4 -- glaciated
+						biome = 3 --algae
+						c_selected_worm = c_worm_green
 					end
+
 				else
-					biome = 3 --algae
+					if is_deep and n_biome <= .95 then
+						biome = 5 --deep glaciated
+					else
+						biome = 4 --glaciated
+					end
 				end
 
-				if math.floor(((nvals_cave[nixyz2] + nvals_wave[nixyz2])/2)*100) == math.floor(tcave*100) then
+				--print(biome)
+
+				if biome > 0 then
+					if y <= DM_TOP and y >= DM_BOT then
+						biome = 6 --DUNGEON MASTER'S LAIR
+						c_selected_worm = c_fire_vine
+					end
+
 					--ceiling
 					local ai = area:index(x,y+1,z) --above index
 					if data[ai] == c_stone and data[vi] == c_air then --ceiling
-						if biome == 6 then
-							if deep_cave_shell_type > 0.65 then
-								data[ai] = c_obsidian[math.random(1, #c_obsidian)]
-								data[vi] = c_obsidian[math.random(1, #c_obsidian)]
-							elseif deep_cave_shell_type > 0.35 then
-								data[ai] = c_coal_block
-								data[vi] = c_coal_block
-							elseif deep_cave_shell_type > 0.15 then
-								data[ai] = c_hard_rock
-								data[vi] = c_hard_rock
-							else
-								data[ai] = c_diamond_block
-								data[vi] = c_diamond_block
-							end
-						end
-
 						if math.random() < ICICHA and (biome == 4 or biome == 5) then
 							data[vi] = c_icid
 						end
 						if math.random() < WORMCHA then
-							data[vi] = c_worm
+							data[vi] = c_selected_worm
 							local bi = area:index(x,y-1,z)
-							data[bi] = c_worm
+							data[bi] = c_selected_worm
 							if math.random(2) == 1 then
 								local bbi = area:index(x,y-2,z)
-								data[bbi] = c_worm
+								data[bbi] = c_selected_worm
 								if math.random(2) ==1 then
 									local bbbi = area:index(x,y-3,z)
-									data[bbbi] = c_worm
+									data[bbbi] = c_selected_worm
 								end
 							end
 						end
@@ -281,13 +225,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 						if biome == 1 then
 							data[vi] = c_moss
 							if math.random() < GEMCHA then
-								-- gems of random size
-								local gems = { c_gem1, c_gem2, c_gem3, c_gem4, c_gem5 }
-								local gidx = math.random(1, 12)
-								if gidx > 5 then
-									gidx = 1
-								end
-								data[ai] = gems[gidx]
+								data[ai] = c_gem
 							end
 						elseif biome == 2 then
 							data[vi] = c_lichen
@@ -317,25 +255,56 @@ minetest.register_on_generated(function(minp, maxp, seed)
 								data[ai] = c_iciu
 							end
 						elseif biome == 6 then
+							data[vi] = c_hcobble
+							if math.random() < FLACHA then --neverending flames
+								data[ai] = c_flame
+							end
+						elseif biome == 7 then
+							local bi = area:index(x,y-1,z)
+							data[vi] = c_salt
+							data[bi] = c_salt
+							if math.random() < GEMCHA then
+								data[ai] = c_saltgem
+							end
+							if math.random() < STAGCHA then
+								caverealms:salt_stalagmite(x,y,z, area, data)
+							end
+						elseif biome == 8 then
+							local bi = area:index(x,y-1,z)
+							if math.random() < 0.5 then
+								data[vi] = c_gobsidian
+								data[bi] = c_gobsidian
+							else
+								data[vi] = c_gobsidian2
+								data[bi] = c_gobsidian2
+							end
+							if math.random() < FLACHA then --neverending flames
+								data[ai] = c_flame
+							end
+						elseif biome == 9 then
 							local bi = area:index(x,y-1,z)
-							if deep_cave_shell_type > 0.65 then
-								data[bi] = c_obsidian[math.random(1, #c_obsidian)]
-								data[vi] = c_obsidian[math.random(1, #c_obsidian)]
-							elseif deep_cave_shell_type > 0.35 then
-								data[bi] = c_coal_block
-								data[vi] = c_coal_block
+							if math.random() < 0.05 then
+								data[vi] = c_coalblock
+								data[bi] = c_coalblock
+							elseif math.random() < 0.15 then
+								data[vi] = c_coaldust
+								data[bi] = c_coaldust
 							else
-								data[bi] = c_hard_rock
-								data[vi] = c_hard_rock
+								data[vi] = c_desand
+								data[bi] = c_desand
+							end
+							if math.random() < FLACHA * 0.75 then --neverending flames
+								data[ai] = c_flame
+							end
+							if math.random() < GEMCHA then
+								data[ai] = c_spike
 							end
-						else
-							print("[caverealms] Unknown cave biome")
 						end
 
 						if math.random() < STAGCHA then
 							caverealms:stalagmite(x,y,z, area, data)
 						end
-						if math.random() < CRYSTAL or (biome == 6 and math.random() < CRYSTAL*1.5) then
+						if math.random() < CRYSTAL then
 							caverealms:crystal_stalagmite(x,y,z, area, data, biome)
 						end
 					end
@@ -356,11 +325,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	vm:set_lighting({day=0, night=0})
 	vm:calc_lighting()
 	--write it to world
-	vm:write_to_map()
+	vm:write_to_map(data)
 
 	--local chugent = math.ceil((os.clock() - t1) * 1000) --grab how long it took
 	--print ("[caverealms] "..chugent.." ms") --tell people how long
 end)
-
-
 print("[caverealms] loaded!")
diff --git a/caverealms_lite/mod.conf b/caverealms_lite/mod.conf
new file mode 100644
index 0000000..1f32f70
--- /dev/null
+++ b/caverealms_lite/mod.conf
@@ -0,0 +1 @@
+name = caverealms
\ No newline at end of file
diff --git a/caverealms_lite/nodes.lua b/caverealms_lite/nodes.lua
new file mode 100644
index 0000000..1a82de3
--- /dev/null
+++ b/caverealms_lite/nodes.lua
@@ -0,0 +1,528 @@
+--glowing crystal
+minetest.register_node("caverealms:glow_crystal", {
+	description = "Glow Sapphire",
+	tiles = {"caverealms_glow_crystal.png"},
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 13,
+	paramtype = "light",
+	use_texture_alpha = true,
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+})
+
+--glowing emerald
+minetest.register_node("caverealms:glow_emerald", {
+	description = "Glow Emerald",
+	tiles = {"caverealms_glow_emerald.png"},
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 13,
+	paramtype = "light",
+	use_texture_alpha = true,
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+})
+
+--glowing mese crystal blocks
+minetest.register_node("caverealms:glow_mese", {
+	description = "Glow Mese Crystal",
+	tiles = {"caverealms_glow_mese.png"},
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 13,
+	paramtype = "light",
+	use_texture_alpha = true,
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+})
+
+--glowing ruby
+minetest.register_node("caverealms:glow_ruby", {
+	description = "Glow Ruby",
+	tiles = {"caverealms_glow_ruby.png"},
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 13,
+	paramtype = "light",
+	use_texture_alpha = true,
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+})
+
+--glowing amethyst
+minetest.register_node("caverealms:glow_amethyst", {
+	description = "Glow Amethyst",
+	tiles = {"caverealms_glow_amethyst.png"},
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 13,
+	paramtype = "light",
+	use_texture_alpha = true,
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+})
+
+--embedded crystal
+minetest.register_node("caverealms:glow_ore", {
+	description = "Glow Crystal Ore",
+	tiles = {"caverealms_glow_ore.png"},
+	is_ground_content = true,
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 10,
+	paramtype = "light",
+})
+
+--embedded emerald
+minetest.register_node("caverealms:glow_emerald_ore", {
+	description = "Glow Emerald Ore",
+	tiles = {"caverealms_glow_emerald_ore.png"},
+	is_ground_content = true,
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 10,
+	paramtype = "light",
+})
+
+--embedded ruby
+minetest.register_node("caverealms:glow_ruby_ore", {
+	description = "Glow Ruby Ore",
+	tiles = {"caverealms_glow_ruby_ore.png"},
+	is_ground_content = true,
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 10,
+	paramtype = "light",
+})
+
+--embedded amethyst
+minetest.register_node("caverealms:glow_amethyst_ore", {
+	description = "Glow Amethyst Ore",
+	tiles = {"caverealms_glow_amethyst_ore.png"},
+	is_ground_content = true,
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 10,
+	paramtype = "light",
+})
+
+--thin (transparent) ice
+minetest.register_node("caverealms:thin_ice", {
+	description = "Thin Ice",
+	tiles = {"caverealms_thin_ice.png"},
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_glass_defaults(),
+	use_texture_alpha = true,
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+	freezemelt = "default:water_source",
+	paramtype = "light",
+})
+
+--salt crystal
+minetest.register_node("caverealms:salt_crystal", {
+	description = "Salt Crystal",
+	tiles = {"caverealms_salt_crystal.png"},
+	is_ground_content = true,
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 11,
+	paramtype = "light",
+	use_texture_alpha = true,
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+})
+
+--glowing crystal gem
+minetest.register_node("caverealms:glow_gem", {
+	description = "Glow Gem",
+	tiles = {"caverealms_glow_gem.png"},
+	inventory_image = "caverealms_glow_gem.png",
+	wield_image = "caverealms_glow_gem.png",
+	is_ground_content = true,
+	groups = {cracky = 3, oddly_breakable_by_hand = 1, attached_node = 1},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 11,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 0.75,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	}
+})
+
+--glowing salt gem
+minetest.register_node("caverealms:salt_gem", {
+	description = "Salt Gem",
+	tiles = {"caverealms_salt_gem.png"},
+	inventory_image = "caverealms_salt_gem.png",
+	wield_image = "caverealms_salt_gem.png",
+	is_ground_content = true,
+	groups = {cracky = 3, oddly_breakable_by_hand = 1, attached_node = 1},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 11,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 0.75,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	}
+})
+
+--stone spike
+minetest.register_node("caverealms:spike", {
+	description = "Stone Spike",
+	tiles = {"caverealms_spike.png"},
+	inventory_image = "caverealms_spike.png",
+	wield_image = "caverealms_spike.png",
+	is_ground_content = true,
+	groups = {cracky = 3, oddly_breakable_by_hand = 1, attached_node = 1},
+	sounds = default.node_sound_stone_defaults(),
+	light_source = 3,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 0.75,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	}
+})
+
+
+--upward pointing icicle
+minetest.register_node("caverealms:icicle_up", {
+	description = "Icicle",
+	tiles = {"caverealms_icicle_up.png"},
+	inventory_image = "caverealms_icicle_up.png",
+	wield_image = "caverealms_icicle_up.png",
+	is_ground_content = true,
+	groups = {cracky=3, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 8,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 1.0,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -7/16, 0.5},
+	},
+})
+
+--downward pointing icicle
+minetest.register_node("caverealms:icicle_down", {
+	description = "Icicle",
+	tiles = {"caverealms_icicle_down.png"},
+	inventory_image = "caverealms_icicle_down.png",
+	wield_image = "caverealms_icicle_down.png",
+	is_ground_content = true,
+	groups = {cracky=3, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_glass_defaults(),
+	light_source = 8,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 1.0,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, 7/16, -0.5, 0.5, 0.5, 0.5},
+	},
+})
+
+--cave mossy cobble - bluish?
+minetest.register_node("caverealms:stone_with_moss", {
+	description = "Cave Stone with Moss",
+	tiles = {"default_cobble.png^caverealms_moss.png", "default_cobble.png", "default_cobble.png^caverealms_moss_side.png"},
+	is_ground_content = true,
+	groups = {crumbly=1, cracky=3},
+	drop = 'default:cobble',
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.25},
+	}),
+})
+
+--cave lichen-covered cobble - purple-ish
+minetest.register_node("caverealms:stone_with_lichen", {
+	description = "Cave Stone with Lichen",
+	tiles = {"default_cobble.png^caverealms_lichen.png", "default_cobble.png", "default_cobble.png^caverealms_lichen_side.png"},
+	is_ground_content = true,
+	groups = {crumbly=1, cracky=3},
+	drop = 'default:cobble',
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.25},
+	}),
+})
+
+--cave algae-covered cobble - yellow-ish
+minetest.register_node("caverealms:stone_with_algae", {
+	description = "Cave Stone with Algae",
+	tiles = {"default_cobble.png^caverealms_algae.png", "default_cobble.png", "default_cobble.png^caverealms_algae_side.png"},
+	is_ground_content = true,
+	groups = {crumbly=1, cracky=3},
+	drop = 'default:cobble',
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.25},
+	}),
+})
+
+--tiny-salt-crystal-covered cobble - pink-ish
+minetest.register_node("caverealms:stone_with_salt", {
+	description = "Salt Crystal",
+	tiles = {"caverealms_salty2.png"},
+	light_source = 9,
+	paramtype = "light",
+	use_texture_alpha = true,
+	drawtype = "glasslike",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_glass_defaults(),
+})
+
+--Hot Cobble - cobble with lava instead of mortar XD
+minetest.register_node("caverealms:hot_cobble", {
+	description = "Hot Cobble",
+	tiles = {"caverealms_hot_cobble.png"},
+	is_ground_content = true,
+	groups = {cracky=1, hot=1, unbreakable = 1},
+	damage_per_second = 1,
+	light_source = 3,
+	paramtype = "light",
+	sounds = default.node_sound_stone_defaults({
+		footstep = {name="default_stone_footstep", gain=0.25},
+	}),
+})
+
+--Glow Obsidian
+minetest.register_node("caverealms:glow_obsidian", {
+	description = "Glowing Obsidian",
+	tiles = {"caverealms_glow_obsidian.png"},
+	is_ground_content = true,
+	groups = {cracky=1, level=2},
+	light_source = 7,
+	paramtype = "light",
+	sounds = default.node_sound_stone_defaults({
+		footstep = {name="default_stone_footstep", gain=0.25},
+	}),
+})
+
+--Glow Obsidian 2 - has traces of lava
+minetest.register_node("caverealms:glow_obsidian_2", {
+	description = "Hot Glowing Obsidian",
+	tiles = {"caverealms_glow_obsidian2.png"},
+	is_ground_content = true,
+	groups = {cracky=1, hot=1, level=2},
+	light_source = 9,
+	paramtype = "light",
+	sounds = default.node_sound_stone_defaults({
+		footstep = {name="default_stone_footstep", gain=0.25},
+	}),
+})
+
+--Glow Obsidian Bricks
+minetest.register_node("caverealms:glow_obsidian_brick", {
+	description = "Glow Obsidian Brick",
+	tiles = {"caverealms_glow_obsidian_brick.png"},
+	light_source = 7,
+	groups = {cracky = 1, level = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("caverealms:glow_obsidian_brick_2", {
+	description = "Glow Obsidian Brick",
+	tiles = {"caverealms_glow_obsidian_brick_2.png"},
+	light_source = 9,
+	groups = {cracky = 1, level = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+--Glow Obsidian Stairs/Slabs
+stairs.register_stair_and_slab(
+	"glow_obsidian_brick",
+	"caverealms:glow_obsidian_brick",
+	{cracky = 1, level = 2},
+	{"caverealms_glow_obsidian_brick.png"},
+	"Glow Obsidian Brick Stair",
+	"Glow Obsidian Brick Slab",
+	default.node_sound_stone_defaults())
+
+stairs.register_stair_and_slab(
+	"glow_obsidian_brick_2",
+	"caverealms:glow_obsidian_brick_2",
+	{cracky = 1, level = 2},
+	{"caverealms_glow_obsidian_brick_2.png"},
+	"Glow Obsidian Brick Stair",
+	"Glow Obsidian Brick Slab",
+	default.node_sound_stone_defaults())
+
+--Glow Obsidian Glass
+minetest.register_node("caverealms:glow_obsidian_glass", {
+	description = "Glow Obsidian Glass",
+	drawtype = "glasslike_framed_optional",
+	tiles = {"caverealms_glow_obsidian_glass.png", "default_obsidian_glass_detail.png"},
+	paramtype = "light",
+	light_source = 13,
+	sunlight_propagates = true,
+	groups = {cracky = 3},
+	sounds = default.node_sound_glass_defaults(),
+})
+
+--Coal Dust
+minetest.register_node("caverealms:coal_dust", {
+	description = "Coal Dust",
+	tiles = {"caverealms_coal_dust.png"},
+	is_ground_content = true,
+	groups = {crumbly=3, falling_node=1, sand=1},
+	sounds = default.node_sound_sand_defaults(),
+})
+
+--glow worms
+minetest.register_node("caverealms:glow_worm", {
+	description = "Blue Glow Worms",
+	tiles = {"caverealms_glow_worm.png"},
+	inventory_image = "caverealms_glow_worm.png",
+	wield_image = "caverealms_glow_worm.png",
+	is_ground_content = true,
+	groups = {oddly_breakable_by_hand=3},
+	light_source = 9,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 1.0,
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/6, -1/2, -1/6, 1/6, 1/2, 1/6},
+	},
+})
+
+minetest.register_node("caverealms:glow_worm_green", {
+	description = "Green Glow Worms",
+	tiles = {"caverealms_glow_worm_green.png"},
+	inventory_image = "caverealms_glow_worm_green.png",
+	wield_image = "caverealms_glow_worm_green.png",
+	is_ground_content = true,
+	groups = {oddly_breakable_by_hand=3},
+	light_source = 9,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 1.0,
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/6, -1/2, -1/6, 1/6, 1/2, 1/6},
+	},
+})
+
+minetest.register_node("caverealms:fire_vine", {
+	description = "Fire Vine",
+	tiles = {"caverealms_fire_vine.png"},
+	inventory_image = "caverealms_fire_vine.png",
+	wield_image = "caverealms_fire_vine.png",
+	is_ground_content = true,
+	damage_per_second = 1,
+	groups = {oddly_breakable_by_hand=3},
+	light_source = 9,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 1.0,
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/6, -1/2, -1/6, 1/6, 1/2, 1/6},
+	},
+})
+
+
+--define special flame so that it does not expire
+minetest.register_node("caverealms:constant_flame", {
+	description = "Fire",
+	drawtype = "plantlike",
+	tiles = {{
+		name="fire_basic_flame_animated.png",
+		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1},
+	}},
+	inventory_image = "fire_basic_flame.png",
+	light_source = 14,
+	groups = {igniter=2, dig_immediate=3, hot=3, not_in_creative_inventory=1},
+	paramtype = "light",
+	drop = '',
+	walkable = false,
+	buildable_to = true,
+	damage_per_second = 4,
+})
+
+--dungeon master statue (nodebox)
+minetest.register_node("caverealms:dm_statue", {
+	description = "Dungeon Master Statue",
+	tiles = {
+		"caverealms_dm_stone.png",
+		"caverealms_dm_stone.png",
+		"caverealms_dm_stone.png",
+		"caverealms_dm_stone.png",
+		"caverealms_dm_stone.png",
+		"caverealms_stone_eyes.png"
+	},
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {cracky=2},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.4375, -0.5, -0.4375, 0.4375, -0.3125, 0.4375}, -- NodeBox1
+			{-0.25, -0.125, -0.1875, 0.25, 0.5, 0.1875}, -- NodeBox2
+			{-0.375, 0, -0.125, -0.25, 0.4375, 0.125}, -- NodeBox3
+			{0.25, 0.125, -0.4375, 0.375, 0.375, 0.1875}, -- NodeBox4
+			{-0.25, -0.5, -0.125, -0.125, -0.125, 0.125}, -- NodeBox5
+			{0.125, -0.3125, -0.125, 0.25, 0, 0.125}, -- NodeBox6
+		}
+	},
+	selection_box = {
+		type = "regular"
+	}
+})
+
+
+-- Compatibility
+minetest.register_alias("caverealms:hanging_thin_ice", "caverealms:thin_ice")
+
+minetest.register_alias("caverealms:spike_2", "caverealms:spike")
+minetest.register_alias("caverealms:spike_3", "caverealms:spike")
+minetest.register_alias("caverealms:spike_4", "caverealms:spike")
+minetest.register_alias("caverealms:spike_5", "caverealms:spike")
+
+minetest.register_alias("caverealms:salt_gem_2", "caverealms:salt_gem")
+minetest.register_alias("caverealms:salt_gem_3", "caverealms:salt_gem")
+minetest.register_alias("caverealms:salt_gem_4", "caverealms:salt_gem")
+minetest.register_alias("caverealms:salt_gem_5", "caverealms:salt_gem")
+
+minetest.register_alias("caverealms:glow_gem_2", "caverealms:glow_gem")
+minetest.register_alias("caverealms:glow_gem_3", "caverealms:glow_gem")
+minetest.register_alias("caverealms:glow_gem_4", "caverealms:glow_gem")
+minetest.register_alias("caverealms:glow_gem_5", "caverealms:glow_gem")
+
+minetest.register_alias("caverealms:obsidian", "default:obsidian")
+minetest.register_alias("caverealms:obsidian_1", "default:obsidian")
+minetest.register_alias("caverealms:obsidian_2", "default:obsidian")
+minetest.register_alias("caverealms:obsidian_3", "default:obsidian")
+minetest.register_alias("caverealms:obsidian_4", "default:obsidian")
diff --git a/caverealms_lite/plants.lua b/caverealms_lite/plants.lua
new file mode 100644
index 0000000..1ebeff7
--- /dev/null
+++ b/caverealms_lite/plants.lua
@@ -0,0 +1,188 @@
+-- Lichen biome
+
+-- glowing fungi
+minetest.register_node("caverealms:fungus", {
+	description = "Glowing Fungus",
+	tiles = {"caverealms_fungi.png"},
+	inventory_image = "caverealms_fungi.png",
+	wield_image = "caverealms_fungi.png",
+	is_ground_content = true,
+	groups = {oddly_breakable_by_hand = 3, attached_node = 1},
+	light_source = 5,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 1.0,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	},
+})
+
+-- mycena mushroom
+minetest.register_node("caverealms:mycena", {
+	description = "Mycena Mushroom",
+	tiles = {"caverealms_mycena.png"},
+	inventory_image = "caverealms_mycena.png",
+	wield_image = "caverealms_mycena.png",
+	is_ground_content = true,
+	groups = {oddly_breakable_by_hand = 3, attached_node = 1},
+	light_source = 6,
+	paramtype = "light",
+	drawtype = "plantlike",
+	walkable = false,
+	buildable_to = true,
+	visual_scale = 1.0,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+	},
+})
+
+-- giant mushroom
+if minetest.get_modpath("ethereal") then
+	minetest.register_alias("caverealms:mushroom_cap", "ethereal:mushroom")
+	minetest.register_alias("caverealms:mushroom_stem", "ethereal:mushroom_trunk")
+else
+	-- stem
+	minetest.register_node("caverealms:mushroom_stem", {
+		description = "Giant Mushroom Stem",
+		tiles = {"caverealms_mushroom_stem.png"},
+		is_ground_content = true,
+		groups = {choppy=2, oddly_breakable_by_hand=1},
+	})
+
+	-- cap
+	minetest.register_node("caverealms:mushroom_cap", {
+		description = "Giant Mushroom Cap",
+		tiles = {"caverealms_mushroom_cap.png"},
+		is_ground_content = true,
+		groups = {choppy=2, oddly_breakable_by_hand=1,},
+		drop = {
+			max_items = 1,
+			items = {
+				{items = {"caverealms:mushroom_sapling"}, rarity = 20},
+				{items = {"caverealms:mushroom_cap"}}
+			}
+		},
+	})
+
+	-- sapling
+	minetest.register_node("caverealms:mushroom_sapling", {
+		description = "Mushroom Tree Sapling",
+		drawtype = "plantlike",
+		tiles = {"caverealms_mushroom_sapling.png"},
+		paramtype = "light",
+		sunlight_propagates = true,
+		is_ground_content = false,
+		walkable = false,
+		selection_box = {
+			type = "fixed",
+			fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 7 / 16, 4 / 16}
+		},
+		groups = {snappy = 2, dig_immediate = 3, flammable = 2},
+		sounds = default.node_sound_leaves_defaults(),
+	})
+end
+
+-- gills
+minetest.register_node("caverealms:mushroom_gills", {
+	description = "Giant Mushroom Gills",
+	tiles = {"caverealms_mushroom_gills.png"},
+	is_ground_content = true,
+	light_source = 10,
+	groups = {choppy=2, oddly_breakable_by_hand=1},
+	drawtype = "plantlike",
+	paramtype = "light",
+})
+
+
+-- Saplings
+
+-- grow trees
+local add_tree = function (pos, ofx, ofy, ofz, schem)
+	if not schem then
+		print ("Schematic not found")
+		return
+	end
+	minetest.swap_node(pos, {name = "air"})
+	minetest.place_schematic(
+		{x = pos.x - ofx, y = pos.y - ofy, z = pos.z - ofz},
+		schem, 0, nil, false)
+end
+
+local path = minetest.get_modpath("caverealms").."/schematics/"
+
+-- giant mushrooms
+function grow_caverealms_mushroom(pos)
+	add_tree(pos, 5, 0, 5, path .. "shroom.mts")
+end
+
+-- height check
+local function enough_height(pos, height)
+	local nod = minetest.line_of_sight(
+		{x = pos.x, y = pos.y + 1, z = pos.z},
+		{x = pos.x, y = pos.y + height, z = pos.z})
+	if not nod then
+		return false 
+	else
+		return true 
+	end
+end
+
+minetest.register_abm({
+	label = "Caverealms grow sapling",
+	nodenames = {"ethereal:mushroom_sapling", "caverealms:mushroom_sapling"},
+	interval = 10,
+	chance = 50,
+	catch_up = false,
+	action = function(pos, node)
+		local light_level = minetest.get_node_light(pos)
+		-- check light level
+		if not light_level or light_level > 10 then
+			return
+		end
+		-- get node under sapling
+		local under =  minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}).name
+		-- check if registered
+		if not minetest.registered_nodes[node.name] then
+			return
+		end
+		-- ethereal sapling on lichen stone
+		if node.name == "ethereal:mushroom_sapling"
+		and under == "caverealms:stone_with_lichen"
+		and enough_height(pos, 10) then
+			grow_caverealms_mushroom(pos)
+		-- caverealms sapling on lichen stone
+		elseif node.name == "caverealms:mushroom_sapling"
+		and under == "caverealms:stone_with_lichen"
+		and enough_height(pos, 10) then
+			grow_caverealms_mushroom(pos)
+		end
+	end,
+})
+
+
+-- spread moss/lichen/algae to nearby cobblestone
+minetest.register_abm({
+	label = "Caverealms stone spread",
+	nodenames = {
+		"caverealms:stone_with_moss",
+		"caverealms:stone_with_lichen",
+		"caverealms:stone_with_algae",
+	},
+	neighbors = {"air"},
+	interval = 16,
+	chance = 50,
+	catch_up = false,
+	action = function(pos, node)
+		local num = minetest.find_nodes_in_area_under_air(
+			{x = pos.x - 1, y = pos.y - 2, z = pos.z - 1},
+			{x = pos.x + 1, y = pos.y + 1, z = pos.z + 1},
+			"default:cobble")
+		if #num > 0 then
+			minetest.set_node(num[math.random(#num)], {name = node.name})
+		end
+	end,
+})
diff --git a/caverealms_lite/schematics/shroom.mts b/caverealms_lite/schematics/shroom.mts
new file mode 100644
index 0000000..07e4966
--- /dev/null
+++ b/caverealms_lite/schematics/shroom.mts
diff --git a/caverealms_lite/screenshot.png b/caverealms_lite/screenshot.png
new file mode 100644
index 0000000..ad44945
--- /dev/null
+++ b/caverealms_lite/screenshot.png
diff --git a/caverealms/textures/Thumbs.db b/caverealms_lite/textures/Thumbs.db
index 277f856..277f856 100644
--- a/caverealms/textures/Thumbs.db
+++ b/caverealms_lite/textures/Thumbs.db
diff --git a/caverealms_lite/textures/caverealms_algae.png b/caverealms_lite/textures/caverealms_algae.png
new file mode 100644
index 0000000..1331bb0
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_algae.png
diff --git a/caverealms_lite/textures/caverealms_algae_side.png b/caverealms_lite/textures/caverealms_algae_side.png
new file mode 100644
index 0000000..b9bd4ed
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_algae_side.png
diff --git a/caverealms_lite/textures/caverealms_angler_rod.png b/caverealms_lite/textures/caverealms_angler_rod.png
new file mode 100644
index 0000000..799abec
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_angler_rod.png
diff --git a/caverealms_lite/textures/caverealms_angler_rod_baited.png b/caverealms_lite/textures/caverealms_angler_rod_baited.png
new file mode 100644
index 0000000..98c9f3b
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_angler_rod_baited.png
diff --git a/caverealms_lite/textures/caverealms_angler_rod_weild.png b/caverealms_lite/textures/caverealms_angler_rod_weild.png
new file mode 100644
index 0000000..160a5ff
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_angler_rod_weild.png
diff --git a/caverealms_lite/textures/caverealms_coal_dust.png b/caverealms_lite/textures/caverealms_coal_dust.png
new file mode 100644
index 0000000..be6cbbb
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_coal_dust.png
diff --git a/caverealms_lite/textures/caverealms_dm_stone.png b/caverealms_lite/textures/caverealms_dm_stone.png
new file mode 100644
index 0000000..73e9266
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_dm_stone.png
diff --git a/caverealms_lite/textures/caverealms_fire_vine.png b/caverealms_lite/textures/caverealms_fire_vine.png
new file mode 100644
index 0000000..6f2c2a3
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_fire_vine.png
diff --git a/caverealms_lite/textures/caverealms_fungi.png b/caverealms_lite/textures/caverealms_fungi.png
new file mode 100644
index 0000000..fde8cbf
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_fungi.png
diff --git a/caverealms_lite/textures/caverealms_glow_amethyst.png b/caverealms_lite/textures/caverealms_glow_amethyst.png
new file mode 100644
index 0000000..7daa61b
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_amethyst.png
diff --git a/caverealms_lite/textures/caverealms_glow_amethyst_ore.png b/caverealms_lite/textures/caverealms_glow_amethyst_ore.png
new file mode 100644
index 0000000..403d907
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_amethyst_ore.png
diff --git a/caverealms_lite/textures/caverealms_glow_bait.png b/caverealms_lite/textures/caverealms_glow_bait.png
new file mode 100644
index 0000000..56a084b
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_bait.png
diff --git a/caverealms_lite/textures/caverealms_glow_crystal.png b/caverealms_lite/textures/caverealms_glow_crystal.png
new file mode 100644
index 0000000..b9be395
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_crystal.png
diff --git a/caverealms_lite/textures/caverealms_glow_emerald.png b/caverealms_lite/textures/caverealms_glow_emerald.png
new file mode 100644
index 0000000..025a48b
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_emerald.png
diff --git a/caverealms_lite/textures/caverealms_glow_emerald_ore.png b/caverealms_lite/textures/caverealms_glow_emerald_ore.png
new file mode 100644
index 0000000..9f601aa
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_emerald_ore.png
diff --git a/caverealms_lite/textures/caverealms_glow_gem.png b/caverealms_lite/textures/caverealms_glow_gem.png
new file mode 100644
index 0000000..9bf3426
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_gem.png
diff --git a/caverealms_lite/textures/caverealms_glow_mese.png b/caverealms_lite/textures/caverealms_glow_mese.png
new file mode 100644
index 0000000..ed433fe
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_mese.png
diff --git a/caverealms_lite/textures/caverealms_glow_obsidian.png b/caverealms_lite/textures/caverealms_glow_obsidian.png
new file mode 100644
index 0000000..a157738
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_obsidian.png
diff --git a/caverealms_lite/textures/caverealms_glow_obsidian2.png b/caverealms_lite/textures/caverealms_glow_obsidian2.png
new file mode 100644
index 0000000..7d1dcf3
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_obsidian2.png
diff --git a/caverealms_lite/textures/caverealms_glow_obsidian_brick.png b/caverealms_lite/textures/caverealms_glow_obsidian_brick.png
new file mode 100644
index 0000000..a5c6db8
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_obsidian_brick.png
diff --git a/caverealms_lite/textures/caverealms_glow_obsidian_brick_2.png b/caverealms_lite/textures/caverealms_glow_obsidian_brick_2.png
new file mode 100644
index 0000000..da2b2e3
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_obsidian_brick_2.png
diff --git a/caverealms_lite/textures/caverealms_glow_obsidian_glass.png b/caverealms_lite/textures/caverealms_glow_obsidian_glass.png
new file mode 100644
index 0000000..afd0fa7
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_obsidian_glass.png
diff --git a/caverealms_lite/textures/caverealms_glow_ore.png b/caverealms_lite/textures/caverealms_glow_ore.png
new file mode 100644
index 0000000..19179a9
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_ore.png
diff --git a/caverealms_lite/textures/caverealms_glow_ruby.png b/caverealms_lite/textures/caverealms_glow_ruby.png
new file mode 100644
index 0000000..59fd46b
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_ruby.png
diff --git a/caverealms_lite/textures/caverealms_glow_ruby_ore.png b/caverealms_lite/textures/caverealms_glow_ruby_ore.png
new file mode 100644
index 0000000..31ecb63
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_ruby_ore.png
diff --git a/caverealms_lite/textures/caverealms_glow_worm.png b/caverealms_lite/textures/caverealms_glow_worm.png
new file mode 100644
index 0000000..e324fbd
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_worm.png
diff --git a/caverealms_lite/textures/caverealms_glow_worm_green.png b/caverealms_lite/textures/caverealms_glow_worm_green.png
new file mode 100644
index 0000000..686c277
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_glow_worm_green.png
diff --git a/caverealms_lite/textures/caverealms_hot_cobble.png b/caverealms_lite/textures/caverealms_hot_cobble.png
new file mode 100644
index 0000000..2e873e8
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_hot_cobble.png
diff --git a/caverealms_lite/textures/caverealms_icicle_down.png b/caverealms_lite/textures/caverealms_icicle_down.png
new file mode 100644
index 0000000..adcc340
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_icicle_down.png
diff --git a/caverealms_lite/textures/caverealms_icicle_up.png b/caverealms_lite/textures/caverealms_icicle_up.png
new file mode 100644
index 0000000..fcd5e2a
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_icicle_up.png
diff --git a/caverealms/textures/caverealms_lichen.png b/caverealms_lite/textures/caverealms_lichen.png
index f38fe76..f38fe76 100644
--- a/caverealms/textures/caverealms_lichen.png
+++ b/caverealms_lite/textures/caverealms_lichen.png
diff --git a/caverealms_lite/textures/caverealms_lichen_side.png b/caverealms_lite/textures/caverealms_lichen_side.png
new file mode 100644
index 0000000..b036dc3
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_lichen_side.png
diff --git a/caverealms_lite/textures/caverealms_moss.png b/caverealms_lite/textures/caverealms_moss.png
new file mode 100644
index 0000000..fd23ec3
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_moss.png
diff --git a/caverealms_lite/textures/caverealms_moss_side.png b/caverealms_lite/textures/caverealms_moss_side.png
new file mode 100644
index 0000000..a16d64a
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_moss_side.png
diff --git a/caverealms_lite/textures/caverealms_mushroom_cap.png b/caverealms_lite/textures/caverealms_mushroom_cap.png
new file mode 100644
index 0000000..e5a1a35
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_mushroom_cap.png
diff --git a/caverealms_lite/textures/caverealms_mushroom_gills.png b/caverealms_lite/textures/caverealms_mushroom_gills.png
new file mode 100644
index 0000000..596de9e
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_mushroom_gills.png
diff --git a/caverealms_lite/textures/caverealms_mushroom_sapling.png b/caverealms_lite/textures/caverealms_mushroom_sapling.png
new file mode 100644
index 0000000..262c690
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_mushroom_sapling.png
diff --git a/caverealms_lite/textures/caverealms_mushroom_stem.png b/caverealms_lite/textures/caverealms_mushroom_stem.png
new file mode 100644
index 0000000..d329ef1
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_mushroom_stem.png
diff --git a/caverealms_lite/textures/caverealms_mycena.png b/caverealms_lite/textures/caverealms_mycena.png
new file mode 100644
index 0000000..50ea65b
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_mycena.png
diff --git a/caverealms_lite/textures/caverealms_salt_crystal.png b/caverealms_lite/textures/caverealms_salt_crystal.png
new file mode 100644
index 0000000..dde96fc
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_salt_crystal.png
diff --git a/caverealms_lite/textures/caverealms_salt_gem.png b/caverealms_lite/textures/caverealms_salt_gem.png
new file mode 100644
index 0000000..0419e2e
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_salt_gem.png
diff --git a/caverealms_lite/textures/caverealms_salty2.png b/caverealms_lite/textures/caverealms_salty2.png
new file mode 100644
index 0000000..7f8b521
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_salty2.png
diff --git a/caverealms_lite/textures/caverealms_spike.png b/caverealms_lite/textures/caverealms_spike.png
new file mode 100644
index 0000000..253c9e6
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_spike.png
diff --git a/caverealms_lite/textures/caverealms_stone_eyes.png b/caverealms_lite/textures/caverealms_stone_eyes.png
new file mode 100644
index 0000000..288db06
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_stone_eyes.png
diff --git a/caverealms_lite/textures/caverealms_thin_ice.png b/caverealms_lite/textures/caverealms_thin_ice.png
new file mode 100644
index 0000000..b16036d
--- /dev/null
+++ b/caverealms_lite/textures/caverealms_thin_ice.png
diff --git a/caverealms_lite/textures/fire_basic_flame.png b/caverealms_lite/textures/fire_basic_flame.png
new file mode 100644
index 0000000..7a126e3
--- /dev/null
+++ b/caverealms_lite/textures/fire_basic_flame.png
diff --git a/caverealms_lite/textures/fire_basic_flame_animated.png b/caverealms_lite/textures/fire_basic_flame_animated.png
new file mode 100644
index 0000000..3b312e5
--- /dev/null
+++ b/caverealms_lite/textures/fire_basic_flame_animated.png
diff --git a/computer/computers.lua b/computer/computers.lua
index b9d3dc4..06b04a9 100644
--- a/computer/computers.lua
+++ b/computer/computers.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 -- Amiga 500 lookalike
 computer.register("computer:shefriendSOO", {
diff --git a/computer/depends.txt b/computer/depends.txt
index 947d2a7..997cb0b 100644
--- a/computer/depends.txt
+++ b/computer/depends.txt
@@ -1,2 +1,2 @@
 default
-homedecor_i18n
+homedecor_common
diff --git a/computer/miscitems.lua b/computer/miscitems.lua
index bbef89b..1eb0634 100644
--- a/computer/miscitems.lua
+++ b/computer/miscitems.lua
@@ -2,7 +2,7 @@
 
 -- This file defines some items in order to not have to depend on other mods.
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 if (not minetest.get_modpath("homedecor")) then
 
diff --git a/computer/tetris.lua b/computer/tetris.lua
index 023fc4d..85e9151 100644
--- a/computer/tetris.lua
+++ b/computer/tetris.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local shapes = {
    {  { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },
@@ -231,7 +231,7 @@ local function step(pos, fields)
 	local scr = { formsize, background,
 		t.boardstring, t.previewstring,
 		draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy),
-		"label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "), 
+		"label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "),
 		t.score, close, buttons }
 
 
diff --git a/fake_fire/depends.txt b/fake_fire/depends.txt
index f91fb9f..997cb0b 100644
--- a/fake_fire/depends.txt
+++ b/fake_fire/depends.txt
@@ -1,2 +1,2 @@
-default

-homedecor

+default
+homedecor_common
diff --git a/fake_fire/init.lua b/fake_fire/init.lua
index 5509976..6bdf0b2 100644
--- a/fake_fire/init.lua
+++ b/fake_fire/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 screwdriver = screwdriver or {}
 
diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua
index a1276b8..847cea2 100644
--- a/ferns/gianttreefern.lua
+++ b/ferns/gianttreefern.lua
@@ -14,10 +14,10 @@ local S = plantlife_i18n.gettext
 -- lot of code, lot to load
 
 abstract_ferns.grow_giant_tree_fern = function(pos)
-	local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z}
-	if minetest.get_node(pos_01).name ~= "air"
-			and minetest.get_node(pos_01).name ~= "ferns:sapling_giant_tree_fern"
-			and minetest.get_node(pos_01).name ~= "default:junglegrass" then
+	local pos_aux = {x = pos.x, y = pos.y + 1, z = pos.z}
+	local name = minetest.get_node(pos_aux).name
+	if name ~= "air" and name ~= "ferns:sapling_giant_tree_fern"
+			and name ~= "default:junglegrass" then
 		return
 	end
 
@@ -64,7 +64,9 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 
 	local brk = false
 	for i = 1, size-3 do
-		if minetest.get_node({x = pos.x, y = pos.y + i, z = pos.z}).name ~= "air" then
+		pos_aux.y = pos.y + i
+		local name = minetest.get_node(pos_aux).name
+		if not (name == "air" or (i == 1 and name == "ferns:sapling_giant_tree_fern")) then
 			brk = true
 			break
 		end
diff --git a/ferns/treefern.lua b/ferns/treefern.lua
index 41d49f8..f1ae9b7 100644
--- a/ferns/treefern.lua
+++ b/ferns/treefern.lua
@@ -13,10 +13,10 @@ assert(abstract_ferns.config.enable_treefern == true)
 
 abstract_ferns.grow_tree_fern = function(pos)
 
-	local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z}
-	if minetest.get_node(pos_01).name ~= "air"
-			and minetest.get_node(pos_01).name ~= "ferns:sapling_tree_fern"
-			and minetest.get_node(pos_01).name ~= "default:junglegrass" then
+	local pos_aux = {x = pos.x, y = pos.y + 1, z = pos.z}
+	local name = minetest.get_node(pos_aux).name
+	if name ~= "air" and name ~= "ferns:sapling_tree_fern"
+			and name ~= "default:junglegrass" then
 		return
 	end
 
@@ -30,7 +30,9 @@ abstract_ferns.grow_tree_fern = function(pos)
 	local i = 1
 	local brk = false
 	while (i < size) do
-		if minetest.get_node({x = pos.x, y = pos.y + i, z = pos.z}).name ~= "air" then
+		pos_aux.y = pos.y + i
+		name = minetest.get_node(pos_aux).name
+		if not (name == "air" or (i == 1 and name == "ferns:sapling_tree_fern")) then
 			brk = true
 			break
 		end
diff --git a/gloopblocks/init.lua b/gloopblocks/init.lua
index aed5b44..2211613 100644
--- a/gloopblocks/init.lua
+++ b/gloopblocks/init.lua
@@ -36,14 +36,6 @@ minetest.register_node("gloopblocks:rainbow_block_horizontal", {
 	sounds = default.node_sound_defaults(),
 })
 
-if not minetest.setting_getbool("pbj_pup_alias_nyancat") then
-	if not minetest.registered_nodes["nyancat:nyancat_rainbow"] then
-		minetest.register_alias("nyancat:nyancat_rainbow", "gloopblocks:rainbow_block_horizontal")
-	elseif not minetest.registered_nodes["default:nyancat_rainbow"] then
-		minetest.register_alias("default:nyancat_rainbow", "gloopblocks:rainbow_block_horizontal")
-	end
-end
-
 minetest.register_node("gloopblocks:evil_block", {
 	description = S("Evil Block"),
 	tiles = {"gloopblocks_evil_block.png"},
@@ -913,4 +905,7 @@ minetest.register_node("gloopblocks:fence_steel", {
 
 dofile(minetest.get_modpath("gloopblocks").."/crafts.lua")
 
+minetest.register_alias("nyancat:nyancat_rainbow", "gloopblocks:rainbow_block_horizontal")
+minetest.register_alias("default:nyancat_rainbow", "gloopblocks:rainbow_block_horizontal")
+
 print(S("Gloopblocks Loaded!"))
diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua
deleted file mode 100644
index 146ad69..0000000
--- a/homedecor/bathroom_furniture.lua
+++ /dev/null
@@ -1,166 +0,0 @@
-
-local S = homedecor_i18n.gettext
-
-minetest.register_node("homedecor:bathroom_tiles_dark", {
-	description = S("Bathroom/kitchen tiles (dark)"),
-	tiles = {
-		"homedecor_bathroom_tiles_bg.png"
-	},
-	overlay_tiles = {
-		{ name = "homedecor_bathroom_tiles_fg.png", color = 0xff606060 },
-	},
-	paramtype = "light",
-	paramtype2 = "color",
-	palette = "unifieddyes_palette_extended.png",
-	groups = {cracky=3, ud_param2_colorable = 1},
-	sounds = default.node_sound_stone_defaults(),
-	on_construct = unifieddyes.on_construct,
-})
-
-minetest.register_node("homedecor:bathroom_tiles_medium", {
-	description = S("Bathroom/kitchen tiles (medium)"),
-	tiles = {
-		"homedecor_bathroom_tiles_bg.png"
-	},
-	overlay_tiles = {
-		{ name = "homedecor_bathroom_tiles_fg.png", color = 0xffc0c0c0 },
-	},
-	paramtype = "light",
-	paramtype2 = "color",
-	palette = "unifieddyes_palette_extended.png",
-	groups = {cracky=3, ud_param2_colorable = 1},
-	sounds = default.node_sound_stone_defaults(),
-	on_construct = unifieddyes.on_construct,
-})
-
-minetest.register_node("homedecor:bathroom_tiles_light", {
-	description = S("Bathroom/kitchen tiles (light)"),
-	tiles = {
-		"homedecor_bathroom_tiles_bg.png"
-	},
-	overlay_tiles = {
-			{ name = "homedecor_bathroom_tiles_fg.png", color = 0xffffffff },
-	},
-	paramtype = "light",
-	paramtype2 = "color",
-	palette = "unifieddyes_palette_extended.png",
-	groups = {cracky=3, ud_param2_colorable = 1},
-	sounds = default.node_sound_stone_defaults(),
-	on_construct = unifieddyes.on_construct,
-})
-
-local tr_cbox = {
-	type = "fixed",
-	fixed = { -0.375, -0.3125, 0.25, 0.375, 0.375, 0.5 }
-}
-
-homedecor.register("towel_rod", {
-	description = S("Towel rod with towel"),
-	mesh = "homedecor_towel_rod.obj",
-	tiles = {
-		"homedecor_generic_terrycloth.png",
-		"default_wood.png",
-	},
-	inventory_image = "homedecor_towel_rod_inv.png",
-	selection_box = tr_cbox,
-	walkable = false,
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3},
-	sounds = default.node_sound_defaults(),
-})
-
-homedecor.register("medicine_cabinet", {
-	description = S("Medicine cabinet"),
-	mesh = "homedecor_medicine_cabinet.obj",
-	tiles = {
-		'default_wood.png',
-		'homedecor_medicine_cabinet_mirror.png'
-	},
-	inventory_image = "homedecor_medicine_cabinet_inv.png",
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5}
-	},
-	walkable = false,
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-	on_punch = function(pos, node, puncher, pointed_thing)
-		node.name = "homedecor:medicine_cabinet_open"
-		minetest.swap_node(pos, node)
-	end,
-	infotext=S("Medicine cabinet"),
-	inventory = {
-		size=6,
-	},
-})
-
-homedecor.register("medicine_cabinet_open", {
-	mesh = "homedecor_medicine_cabinet_open.obj",
-	tiles = {
-		'default_wood.png',
-		'homedecor_medicine_cabinet_mirror.png',
-		'homedecor_medicine_cabinet_inside.png'
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3125, -0.1875, -0.25, 0.3125, 0.5, 0.5}
-	},
-	walkable = false,
-	groups = { snappy = 3, not_in_creative_inventory=1 },
-	drop = "homedecor:medicine_cabinet",
-	on_punch = function(pos, node, puncher, pointed_thing)
-		node.name = "homedecor:medicine_cabinet"
-		minetest.swap_node(pos, node)
-	end,
-})
-
--- convert old static nodes
-
-homedecor.old_static_bathroom_tiles = {
-	"homedecor:tiles_1",
-	"homedecor:tiles_2",
-	"homedecor:tiles_3",
-	"homedecor:tiles_4",
-	"homedecor:tiles_red",
-	"homedecor:tiles_tan",
-	"homedecor:tiles_yellow",
-	"homedecor:tiles_green",
-	"homedecor:tiles_blue"
-}
-
-local old_to_color = {
-	"light_grey",
-	"grey",
-	"black",
-	"black"
-}
-
-minetest.register_lbm({
-	name = "homedecor:convert_bathroom_tiles",
-	label = "Convert bathroom tiles to use param2 color",
-	run_at_every_load = false,
-	nodenames = homedecor.old_static_bathroom_tiles,
-	action = function(pos, node)
-		local name = node.name
-		local newname = "homedecor:bathroom_tiles_light"
-		local a = string.find(name, "_")
-		local color = string.sub(name, a + 1)
-
-		if color == "tan" then
-			color = "yellow_s50"
-		elseif color == "1" or color == "2" or color == "3" or color == "4" then
-			if color == "4" then
-				newname = "homedecor:bathroom_tiles_medium"
-			end
-			color = old_to_color[tonumber(color)]
-		elseif color ~= "yellow" then
-			color = color.."_s50"
-		end
-
-		local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "extended")
-
-		minetest.set_node(pos, { name = newname, param2 = paletteidx })
-		local meta = minetest.get_meta(pos)
-		meta:set_string("dye", "unifieddyes:"..color)
-		meta:set_string("palette", "ext")
-	end
-})
diff --git a/homedecor/copyright.txt b/homedecor/copyright.txt
deleted file mode 100644
index 7dc11a3..0000000
--- a/homedecor/copyright.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Most code and all textures by Vanessa Ezekowitz.
-
-Some code copied and modified from the game's default mods (especially 
-doors) and ironzorg's flowers mod.
-
-Licenses: 
-* Door open/close sound by Slanesh on freesound.org
-	http://freesound.org/people/Slanesh/sounds/31768/
-* Gate open/close by j1987 on freesound.org
-	http://freesound.org/people/j1987/sounds/106116/
-* Doorbell sound by guitarguy1985 on freesound.org
-	http://freesound.org/people/guitarguy1985/sounds/69384/
-* Book soundn by mckinneysound's on http://www.freesfx.co.uk/
-	http://www.freesfx.co.uk/sfx/book?p=3
-* Phone ringing sound by andyt's on http://www.freesfx.co.uk/
-	http://www.freesfx.co.uk/sfx/phone?p=5
diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua
deleted file mode 100644
index aaef1dd..0000000
--- a/homedecor/crafts.lua
+++ /dev/null
@@ -1,3033 +0,0 @@
--- Crafting for homedecor mod (includes folding) by Vanessa Ezekowitz
---
--- Mostly my own code; overall template borrowed from game default
-
-local S = homedecor_i18n.gettext
-
--- misc craftitems
-
-minetest.register_craftitem("homedecor:roof_tile_terracotta", {
-        description = S("Terracotta Roof Tile"),
-        inventory_image = "homedecor_roof_tile_terracotta.png",
-})
-
-minetest.register_craftitem("homedecor:drawer_small", {
-        description = S("Small Wooden Drawer"),
-        inventory_image = "homedecor_drawer_small.png",
-})
-
-minetest.register_craftitem("homedecor:blank_canvas", {
-	description = S("Blank Canvas"),
-	inventory_image = "homedecor_blank_canvas.png"
-})
-
-minetest.register_craftitem("homedecor:vcr", {
-	description = S("VCR"),
-	inventory_image = "homedecor_vcr.png"
-})
-
-minetest.register_craftitem("homedecor:dvd_player", {
-	description = S("DVD Player"),
-	inventory_image = "homedecor_dvd_player.png"
-})
-
-minetest.register_craftitem("homedecor:speaker_driver", {
-	description = S("Speaker driver"),
-	inventory_image = "homedecor_speaker_driver_inv.png"
-})
-
-minetest.register_craftitem("homedecor:fan_blades", {
-	description = S("Fan blades"),
-	inventory_image = "homedecor_fan_blades.png"
-})
-
-minetest.register_craftitem("homedecor:soda_can", {
-	description = S("Soda Can"),
-	inventory_image = "homedecor_soda_can.png",
-	on_use = minetest.item_eat(2),
-})
-
--- the actual crafts
-
-minetest.register_craft( {
-    output = "homedecor:fan_blades 2",
-    recipe = {
-		{ "", "basic_materials:plastic_sheet", "" },
-		{ "", "default:steel_ingot", "" },
-		{ "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }
-    },
-})
-
-minetest.register_craft({
-        type = "cooking",
-        output = "homedecor:roof_tile_terracotta",
-        recipe = "basic_materials:terracotta_base",
-})
-
-minetest.register_craft( {
-        output = "homedecor:shingles_terracotta",
-        recipe = {
-                { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"},
-                { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"},
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:roof_tile_terracotta 8",
-        recipe = {
-			{ "homedecor:shingles_terracotta", "homedecor:shingles_terracotta" }
-		}
-})
-
-minetest.register_craft( {
-        output = "homedecor:flower_pot_terracotta",
-        recipe = {
-                { "homedecor:roof_tile_terracotta", "default:dirt", "homedecor:roof_tile_terracotta" },
-                { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta" },
-        },
-})
-
---
-
-minetest.register_craft( {
-        output = "homedecor:flower_pot_green",
-        recipe = {
-                { "", "dye:dark_green", "" },
-                { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" },
-                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:flower_pot_black",
-        recipe = {
-                { "dye:black", "dye:black", "dye:black" },
-                { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" },
-                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-        },
-})
-
---
-
-minetest.register_craft( {
-        output = "homedecor:projection_screen 3",
-        recipe = {
-		{ "", "default:glass", "" },
-                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-        },
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:projection_screen",
-        burntime = 30,
-})
-
---
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:ceiling_paint 20",
-        recipe = {
-                "dye:white",
-                "dye:white",
-                "default:sand",
-		"bucket:bucket_water",
-        },
-	replacements = { { "bucket:bucket_water","bucket:bucket_empty" } }
-})
-
-minetest.register_craft( {
-        output = "homedecor:ceiling_tile 10",
-        recipe = {
-                { "", "dye:white", "" },
-                { "default:steel_ingot", "default:stone", "default:steel_ingot" },
-
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:glass_table_small_round_b 15",
-        recipe = {
-                { "", "default:glass", "" },
-                { "default:glass", "default:glass", "default:glass" },
-                { "", "default:glass", "" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:glass_table_small_square_b 2",
-        recipe = {
-		{"homedecor:glass_table_small_round", "homedecor:glass_table_small_round" },
-	}
-})
-
-minetest.register_craft( {
-        output = "homedecor:glass_table_large_b 2",
-        recipe = {
-		{ "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" },
-	}
-})
-
---
-
-minetest.register_craft( {
-        output = "homedecor:wood_table_small_round_b 15",
-        recipe = {
-                { "", "group:wood", "" },
-                { "group:wood", "group:wood", "group:wood" },
-                { "", "group:wood", "" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:wood_table_small_square_b 2",
-        recipe = {
-		{ "homedecor:wood_table_small_round","homedecor:wood_table_small_round" },
-	}
-})
-
-minetest.register_craft( {
-        output = "homedecor:wood_table_large_b 2",
-        recipe = {
-		{ "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" },
-	}
-})
-
---
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:wood_table_small_round_b",
-        burntime = 30,
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:wood_table_small_square_b",
-        burntime = 30,
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:wood_table_large_b",
-        burntime = 30,
-})
-
---
-
-minetest.register_craft( {
-        output = "homedecor:shingles_asphalt 6",
-        recipe = {
-                { "building_blocks:gravel_spread", "dye:black", "building_blocks:gravel_spread" },
-                { "group:sand", "dye:black", "group:sand" },
-                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-        },
-})
-
---
-
-minetest.register_craft( {
-        output = "homedecor:shingles_wood 12",
-        recipe = {
-                { "group:stick", "group:wood"},
-                { "group:wood", "group:stick"},
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:shingles_wood 12",
-        recipe = {
-                { "group:wood", "group:stick"},
-                { "group:stick", "group:wood"},
-        },
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:shingles_wood",
-        burntime = 30,
-})
-
---
-
-minetest.register_craft( {
-        output = "homedecor:skylight 4",
-        recipe = {
-		{ "homedecor:glass_table_large", "homedecor:glass_table_large" },
-		{ "homedecor:glass_table_large", "homedecor:glass_table_large" },
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:skylight_frosted",
-        recipe = {
-			"dye:white",
-			"homedecor:skylight"
-		},
-})
-
-minetest.register_craft({
-        type = "cooking",
-        output = "homedecor:skylight",
-        recipe = "homedecor:skylight_frosted",
-})
-
-minetest.register_craft( {
-	output = "homedecor:shutter 2",
-	recipe = {
-		{ "group:stick", "group:stick" },
-		{ "group:stick", "group:stick" },
-		{ "group:stick", "group:stick" },
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:shutter_colored",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:shutter",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:shutter_oak",
-        burntime = 30,
-})
-
-minetest.register_craft( {
-        output = "homedecor:drawer_small",
-        recipe = {
-                { "group:wood", "default:steel_ingot", "group:wood" },
-        },
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:drawer_small",
-        burntime = 30,
-})
-
---
-
-minetest.register_craft( {
-        output = "homedecor:nightstand_oak_one_drawer",
-        recipe = {
-                { "homedecor:drawer_small" },
-                { "group:wood" },
-        },
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:nightstand_oak_one_drawer",
-        burntime = 30,
-})
-
-minetest.register_craft( {
-        output = "homedecor:nightstand_oak_two_drawers",
-        recipe = {
-                { "homedecor:drawer_small" },
-                { "homedecor:drawer_small" },
-                { "group:wood" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:nightstand_oak_two_drawers",
-        recipe = {
-                { "homedecor:nightstand_oak_one_drawer" },
-                { "homedecor:drawer_small" },
-        },
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:nightstand_oak_two_drawers",
-        burntime = 30,
-})
-
---
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:nightstand_mahogany_one_drawer",
-        recipe = {
-                "homedecor:nightstand_oak_one_drawer",
-                "dye:brown",
-        },
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:nightstand_mahogany_one_drawer",
-        burntime = 30,
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:nightstand_mahogany_two_drawers",
-        recipe = {
-                "homedecor:nightstand_oak_two_drawers",
-                "dye:brown",
-        },
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:nightstand_mahogany_two_drawers",
-        burntime = 30,
-})
-
--- Table legs
-
-minetest.register_craft( {
-        output = "homedecor:table_legs_wrought_iron 3",
-        recipe = {
-                { "", "default:iron_lump", "" },
-                { "", "default:iron_lump", "" },
-                { "default:iron_lump", "default:iron_lump", "default:iron_lump" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:table_legs_brass 3",
-	recipe = {
-		{ "", "basic_materials:brass_ingot", "" },
-		{ "", "basic_materials:brass_ingot", "" },
-		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }
-	},
-})
-
-minetest.register_craft( {
-        output = "homedecor:utility_table_legs",
-        recipe = {
-                { "group:stick", "group:stick", "group:stick" },
-                { "group:stick", "", "group:stick" },
-                { "group:stick", "", "group:stick" },
-        },
-})
-
-minetest.register_craft({
-        type = "fuel",
-        recipe = "homedecor:utility_table_legs",
-        burntime = 30,
-})
-
--- vertical poles/lampposts
-
-minetest.register_craft( {
-        output = "homedecor:pole_brass 4",
-	recipe = {
-		{ "", "basic_materials:brass_ingot", "" },
-		{ "", "basic_materials:brass_ingot", "" },
-		{ "", "basic_materials:brass_ingot", "" }
-	},
-})
-
-minetest.register_craft( {
-        output = "homedecor:pole_wrought_iron 4",
-        recipe = {
-                { "default:iron_lump", },
-                { "default:iron_lump", },
-                { "default:iron_lump", },
-        },
-})
-
--- Home electronics
-
-minetest.register_craft( {
-	output = "basic_materials:ic 4",
-	recipe = {
-		{ "basic_materials:silicon", "basic_materials:silicon" },
-		{ "basic_materials:silicon", "default:copper_ingot" },
-	},
-})
-
-minetest.register_craft( {
-	output = "homedecor:television",
-	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "moreblocks:glow_glass", "basic_materials:plastic_sheet" },
-		{ "basic_materials:ic", "basic_materials:ic", "basic_materials:ic" },
-	},
-})
-
-minetest.register_craft( {
-	output = "homedecor:television",
-	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" },
-		{ "basic_materials:ic", "basic_materials:energy_crystal_simple", "basic_materials:ic" },
-	},
-})
-
-minetest.register_craft( {
-	output = "homedecor:stereo",
-	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" },
-		{ "default:steel_ingot", "basic_materials:ic", "default:steel_ingot" },
-	},
-})
-
--- ===========================================================
--- Recipes that require materials from wool (cotton alternate)
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:rug_small 8",
-	recipe = {
-			"wool:red",
-			"wool:yellow",
-			"wool:blue",
-			"wool:black"
-	},
-})
-
-minetest.register_craft( {
-	output = "homedecor:rug_persian 8",
-	recipe = {
-		{ "", "wool:yellow", "" },
-		{ "wool:red", "wool:blue", "wool:red" },
-		{ "", "wool:yellow", "" }
-	},
-})
-
--- cotton versions:
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:rug_small 8",
-	recipe = {
-			"cotton:red",
-			"cotton:yellow",
-			"cotton:blue",
-			"cotton:black"
-	},
-})
-
-minetest.register_craft( {
-	output = "homedecor:rug_persian 8",
-	recipe = {
-		{ "", "cotton:yellow", "" },
-		{ "cotton:red", "cotton:blue", "cotton:red" },
-		{ "", "cotton:yellow", "" }
-	},
-})
-
--- fuel recipes for same
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:rug_small",
-	burntime = 30,
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:rug_large 2",
-	recipe = {
-		"homedecor:rug_small",
-		"homedecor:rug_small",
-	},
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:rug_large",
-	burntime = 30,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:rug_persian",
-	burntime = 30,
-})
-
--- Speakers
-
-minetest.register_craft( {
-        output = "homedecor:speaker_driver 2",
-		recipe = {
-		{ "", "default:steel_ingot", "" },
-		{ "default:paper", "basic_materials:copper_wire", "default:iron_lump" },
-		{ "", "default:steel_ingot", "" },
-	},
-})
-
-minetest.register_craft( {
-        output = "homedecor:speaker_small",
-		recipe = {
-		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
-	},
-})
-
-minetest.register_craft( {
-        output = "homedecor:speaker",
-		recipe = {
-		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
-		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
-		{ "wool:black", "group:wood", "group:wood" },
-	},
-})
-
--- cotton version
-
-minetest.register_craft( {
-        output = "homedecor:speaker_small",
-		recipe = {
-		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
-	},
-})
-
-minetest.register_craft( {
-        output = "homedecor:speaker",
-		recipe = {
-		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
-		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
-		{ "cotton:black", "group:wood", "group:wood" },
-	},
-})
-
--- Curtains
-
-minetest.register_craft( {
-	output = "homedecor:curtain_closed 4",
-		recipe = {
-		{ "wool:white", "", ""},
-		{ "wool:white", "", ""},
-		{ "wool:white", "", ""},
-	},
-})
-
-minetest.register_craft( {
-	output = "homedecor:curtain_closed 4",
-		recipe = {
-		{ "cottages:wool", "", ""},
-		{ "cottages:wool", "", ""},
-		{ "cottages:wool", "", ""},
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:curtain_closed",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:curtain_closed",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:curtain_open",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:curtain_open",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-local mats = {
-	{ "brass", "homedecor:pole_brass" },
-	{ "wrought_iron", "homedecor:pole_wrought_iron" },
-	{ "wood", "group:stick" }
-}
-
-for i in ipairs(mats) do
-	local material = mats[i][1]
-	local ingredient = mats[i][2]
-	minetest.register_craft( {
-		output = "homedecor:curtainrod_"..material.." 3",
-		recipe = {
-			{ ingredient, ingredient, ingredient },
-		},
-	})
-end
-
--- Recycling recipes
-
--- Some glass objects recycle via the glass fragments item/recipe in the Vessels mod.
-
-minetest.register_craft({
-        type = "shapeless",
-        output = "vessels:glass_fragments",
-        recipe = {
-		"homedecor:glass_table_small_round",
-		"homedecor:glass_table_small_round",
-		"homedecor:glass_table_small_round"
-	}
-})
-
-minetest.register_craft({
-        type = "shapeless",
-        output = "vessels:glass_fragments",
-        recipe = {
-		"homedecor:glass_table_small_square",
-		"homedecor:glass_table_small_square",
-		"homedecor:glass_table_small_square"
-	}
-})
-
-minetest.register_craft({
-        type = "shapeless",
-        output = "vessels:glass_fragments",
-        recipe = {
-		"homedecor:glass_table_large",
-		"homedecor:glass_table_large",
-		"homedecor:glass_table_large"
-	}
-})
-
-minetest.register_craft({
-        type = "shapeless",
-        output = "vessels:glass_fragments 2",
-        recipe = {
-		"homedecor:skylight",
-		"homedecor:skylight",
-		"homedecor:skylight",
-		"homedecor:skylight",
-		"homedecor:skylight",
-		"homedecor:skylight"
-	}
-})
-
--- Wooden tabletops can turn into sticks
-
-minetest.register_craft({
-        type = "shapeless",
-        output = "default:stick 4",
-        recipe = {
-		"homedecor:wood_table_small_round",
-		"homedecor:wood_table_small_round",
-		"homedecor:wood_table_small_round"
-	}
-})
-
-minetest.register_craft({
-        type = "shapeless",
-        output = "default:stick 4",
-        recipe = {
-		"homedecor:wood_table_small_square",
-		"homedecor:wood_table_small_square",
-		"homedecor:wood_table_small_square"
-	}
-})
-
-minetest.register_craft({
-        type = "shapeless",
-        output = "default:stick 4",
-        recipe = {
-		"homedecor:wood_table_large",
-		"homedecor:wood_table_large",
-		"homedecor:wood_table_large"
-	}
-})
-
--- Kitchen stuff
-
-minetest.register_craft({
-        output = "homedecor:oven_steel",
-        recipe = {
-		{"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", },
-		{"default:steel_ingot", "moreblocks:iron_glass", "default:steel_ingot", },
-		{"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:oven_steel",
-        recipe = {
-		{"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", },
-		{"default:steel_ingot", "default:glass", "default:steel_ingot", },
-		{"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", },
-	}
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:oven",
-	recipe = {
-		"homedecor:oven_steel",
-		"dye:white",
-		"dye:white",
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:microwave_oven 2",
-        recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", },
-		{"default:steel_ingot", "moreblocks:iron_glass", "basic_materials:ic", },
-		{"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:microwave_oven 2",
-        recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", },
-		{"default:steel_ingot", "default:glass", "basic_materials:ic", },
-		{"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", },
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:refrigerator_steel",
-	recipe = {
-		{"default:steel_ingot", "homedecor:glowlight_small_cube", "default:steel_ingot", },
-		{"default:steel_ingot", "default:copperblock", "default:steel_ingot", },
-		{"default:steel_ingot", "default:clay", "default:steel_ingot", },
-	}
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:refrigerator_white",
-	recipe = {
-		"homedecor:refrigerator_steel",
-		"dye:white",
-		"dye:white",
-		"dye:white",
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet",
-        recipe = {
-		{"group:wood", "group:stick", "group:wood", },
-		{"group:wood", "group:stick", "group:wood", },
-		{"group:wood", "group:stick", "group:wood", },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_steel",
-        recipe = {
-			{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-			{"", "homedecor:kitchen_cabinet", ""},
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_steel",
-        recipe = {
-			{"moreblocks:slab_steelblock_1"},
-			{ "homedecor:kitchen_cabinet" },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_marble",
-        recipe = {
-			{"building_blocks:slab_marble"},
-			{"homedecor:kitchen_cabinet"},
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_marble",
-        recipe = {
-			{"technic:slab_marble_1"},
-			{"homedecor:kitchen_cabinet"},
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_granite",
-        recipe = {
-			{"technic:slab_granite_1"},
-			{"homedecor:kitchen_cabinet"},
-	}
-})
-
-minetest.register_craft({
-	type = "shapeless",
-        output = "homedecor:kitchen_cabinet_half 2",
-        recipe = { "homedecor:kitchen_cabinet" }
-})
-
-minetest.register_craft({
-        output = "homedecor:kitchen_cabinet_with_sink",
-        recipe = {
-		{"group:wood", "default:steel_ingot", "group:wood", },
-		{"group:wood", "default:steel_ingot", "group:wood", },
-		{"group:wood", "group:stick", "group:wood", },
-	}
-})
-
-------- Lighting
-
--- candles
-
-minetest.register_craft({
-	output = "homedecor:candle_thin 4",
-	recipe = {
-		{"farming:string" },
-		{"basic_materials:paraffin" }
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:candle 2",
-	recipe = {
-		{"farming:string" },
-		{"basic_materials:paraffin" },
-		{"basic_materials:paraffin" }
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:wall_sconce 2",
-	recipe = {
-		{"default:iron_lump", "", ""},
-		{"default:iron_lump", "homedecor:candle", ""},
-		{"default:iron_lump", "", ""},
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:candlestick_wrought_iron",
-	recipe = {
-		{""},
-		{"homedecor:candle_thin"},
-		{"default:iron_lump"},
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:candlestick_brass",
-	recipe = {
-		{""},
-		{"homedecor:candle_thin"},
-		{"basic_materials:brass_ingot"},
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:oil_lamp",
-	recipe = {
-		{ "", "vessels:glass_bottle", "" },
-		{ "", "farming:string", "" },
-		{ "default:steel_ingot", "basic_materials:oil_extract", "default:steel_ingot" }
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:oil_lamp_tabletop",
-	recipe = {
-		{ "", "vessels:glass_bottle", "" },
-		{ "", "farming:string", "" },
-		{ "default:iron_lump", "basic_materials:oil_extract", "default:iron_lump" }
-	}
-})
-
--- Wrought-iron wall latern
-
-minetest.register_craft({
-	output = "homedecor:ground_lantern",
-	recipe = {
-		{ "default:iron_lump", "default:iron_lump", "default:iron_lump" },
-		{ "default:iron_lump", "default:torch", "default:iron_lump" },
-		{ "", "default:iron_lump", "" }
-	}
-})
-
--- wood-lattice lamps
-
-if minetest.get_modpath("darkage") then
-	minetest.register_craft( {
-		output = "homedecor:lattice_lantern_small 8",
-		recipe = {
-			{ "darkage:lamp" },
-		},
-	})
-
-	minetest.register_craft( {
-		output = "darkage:lamp",
-		type = "shapeless",
-		recipe = {
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-		},
-	})
-else
-	minetest.register_craft( {
-			output = "homedecor:lattice_lantern_large 2",
-			recipe = {
-				{ "dye:black", "dye:yellow", "dye:black" },
-				{ "group:stick", "building_blocks:woodglass", "group:stick" },
-				{ "group:stick", "basic_materials:energy_crystal_simple", "group:stick" }
-			},
-	})
-
-	minetest.register_craft( {
-		output = "homedecor:lattice_lantern_small 8",
-		recipe = {
-			{ "homedecor:lattice_lantern_large" },
-		},
-	})
-
-	minetest.register_craft( {
-		output = "homedecor:lattice_lantern_large",
-		type = "shapeless",
-		recipe = {
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-			"homedecor:lattice_lantern_small",
-		},
-	})
-end
-
--- glowlights
-
-minetest.register_craft({
-	output = "homedecor:glowlight_half 6",
-	recipe = {
-		{ "default:glass", "basic_materials:energy_crystal_simple", "default:glass", },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:glowlight_half 6",
-        recipe = {
-		{"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:glowlight_half",
-        recipe = {
-		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"},
-		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}
-	}
-})
-
-minetest.register_craft({
-		output = "homedecor:glowlight_half",
-		type = "shapeless",
-		recipe = {
-		"homedecor:glowlight_quarter",
-		"homedecor:glowlight_quarter"
-	}
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:glowlight_half",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:glowlight_half",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:glowlight_quarter 6",
-        recipe = {
-		{"homedecor:glowlight_half", "homedecor:glowlight_half", "homedecor:glowlight_half", },
-	}
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:glowlight_quarter",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:glowlight_quarter",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:glowlight_small_cube 8",
-	recipe = {
-		{ "dye:white" },
-		{ "default:glass" },
-		{ "basic_materials:energy_crystal_simple" },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:glowlight_small_cube 8",
-        recipe = {
-		{"dye:white" },
-		{"moreblocks:super_glow_glass" },
-	}
-})
-
-minetest.register_craft({
-        output = "homedecor:glowlight_small_cube 4",
-        recipe = {
-		{"homedecor:glowlight_half" },
-	}
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:glowlight_small_cube",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:glowlight_small_cube",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-----
-
-minetest.register_craft({
-    output = "homedecor:plasma_lamp",
-    recipe = {
-		{"", "default:glass", ""},
-		{"default:glass", "basic_materials:energy_crystal_simple", "default:glass"},
-		{"", "default:glass", ""}
-	}
-})
-
-minetest.register_craft({
-    output = "homedecor:plasma_ball 2",
-    recipe = {
-		{"", "default:glass", ""},
-		{"default:glass", "default:copper_ingot", "default:glass"},
-		{"basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet"}
-	}
-})
-
--- Brass/wrought iron fences
-
-
-minetest.register_craft( {
-        output = "homedecor:fence_brass 6",
-	recipe = {
-		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" },
-		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" },
-	},
-})
-
-minetest.register_craft( {
-	output = "homedecor:fence_wrought_iron 6",
-	recipe = {
-		{ "default:iron_lump","default:iron_lump","default:iron_lump" },
-		{ "default:iron_lump","default:iron_lump","default:iron_lump" },
-	},
-})
-
--- other types of fences
-
-minetest.register_craft( {
-	output = "homedecor:fence_wrought_iron_2 4",
-	recipe = {
-		{ "homedecor:pole_wrought_iron", "default:iron_lump" },
-		{ "homedecor:pole_wrought_iron", "default:iron_lump" },
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_wrought_iron_2_corner",
-	recipe = {
-		"homedecor:fence_wrought_iron_2",
-		"homedecor:fence_wrought_iron_2"
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_wrought_iron_2 2",
-	recipe = {
-		"homedecor:fence_wrought_iron_2_corner",
-	},
-})
-
---
-
-minetest.register_craft( {
-	output = "homedecor:fence_picket 6",
-	recipe = {
-		{ "group:stick", "group:stick", "group:stick" },
-		{ "group:stick", "", "group:stick" },
-		{ "group:stick", "group:stick", "group:stick" }
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_picket_corner",
-	recipe = {
-		"homedecor:fence_picket",
-		"homedecor:fence_picket"
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_picket 2",
-	recipe = {
-		"homedecor:fence_picket_corner"
-	},
-})
-
---
-
-
-minetest.register_craft( {
-	output = "homedecor:fence_picket_white 6",
-	recipe = {
-		{ "group:stick", "group:stick", "group:stick" },
-		{ "group:stick", "dye:white", "group:stick" },
-		{ "group:stick", "group:stick", "group:stick" }
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_picket_corner_white",
-	recipe = {
-		"homedecor:fence_picket_white",
-		"homedecor:fence_picket_white"
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_picket_white 2",
-	recipe = {
-		"homedecor:fence_picket_corner_white"
-	},
-})
-
---
-
-
-minetest.register_craft( {
-	output = "homedecor:fence_privacy 6",
-	recipe = {
-		{ "group:wood", "group:stick", "group:wood" },
-		{ "group:wood", "", "group:wood" },
-		{ "group:wood", "group:stick", "group:wood" }
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_privacy_corner",
-	recipe = {
-		"homedecor:fence_privacy",
-		"homedecor:fence_privacy"
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_privacy 2",
-	recipe = {
-		"homedecor:fence_privacy_corner"
-	},
-})
-
---
-
-
-minetest.register_craft( {
-	output = "homedecor:fence_barbed_wire 6",
-	recipe = {
-		{ "group:stick", "basic_materials:steel_wire", "group:stick" },
-		{ "group:stick", "", "group:stick" },
-		{ "group:stick", "basic_materials:steel_wire", "group:stick" }
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_barbed_wire_corner",
-	recipe = { "homedecor:fence_barbed_wire", "homedecor:fence_barbed_wire" },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_barbed_wire 2",
-	recipe = { "homedecor:fence_barbed_wire_corner" },
-})
-
---
-
-
-minetest.register_craft( {
-	output = "homedecor:fence_chainlink 9",
-	recipe = {
-		{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
-		{ "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" },
-		{ "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" }
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_chainlink_corner",
-	recipe = { "homedecor:fence_chainlink", "homedecor:fence_chainlink" },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "homedecor:fence_chainlink 2",
-	recipe = { "homedecor:fence_chainlink_corner" },
-})
-
-
--- Gates
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:gate_picket_white_closed",
-        recipe = {
-			"homedecor:fence_picket_white"
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:fence_picket_white",
-        recipe = {
-			"homedecor:gate_picket_white_closed"
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:gate_picket_closed",
-        recipe = {
-			"homedecor:fence_picket"
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:fence_picket",
-        recipe = {
-			"homedecor:gate_picket_closed"
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:gate_barbed_wire_closed",
-        recipe = {
-			"homedecor:fence_barbed_wire"
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:fence_barbed_wire",
-        recipe = {
-			"homedecor:gate_barbed_wire_closed"
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:gate_chainlink_closed",
-        recipe = {
-			"homedecor:fence_chainlink"
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:fence_chainlink",
-        recipe = {
-			"homedecor:gate_chainlink_closed"
-        },
-})
-
------- Doors
-
--- plain wood, non-windowed
-
-minetest.register_craft( {
-        output = "homedecor:door_wood_plain_left 2",
-        recipe = {
-			{ "group:wood", "group:wood", "" },
-			{ "group:wood", "group:wood", "default:steel_ingot" },
-			{ "group:wood", "group:wood", "" },
-        },
-})
-
--- fancy exterior
-
-minetest.register_craft( {
-        output = "homedecor:door_exterior_fancy_left 2",
-        recipe = {
-			{ "group:wood", "default:glass" },
-			{ "group:wood", "group:wood" },
-			{ "group:wood", "group:wood" },
-        },
-})
-
--- wood and glass (grid style)
-
--- bare
-
-minetest.register_craft( {
-        output = "homedecor:door_wood_glass_oak_left 2",
-        recipe = {
-			{ "default:glass", "group:wood" },
-			{ "group:wood", "default:glass" },
-			{ "default:glass", "group:wood" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:door_wood_glass_oak_left 2",
-        recipe = {
-			{ "group:wood", "default:glass" },
-			{ "default:glass", "group:wood" },
-			{ "group:wood", "default:glass" },
-        },
-})
-
--- mahogany
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:door_wood_glass_mahogany_left 2",
-        recipe = {
-			"default:dirt",
-			"default:coal_lump",
-			"homedecor:door_wood_glass_oak_left",
-			"homedecor:door_wood_glass_oak_left"
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:door_wood_glass_mahogany_left 2",
-        recipe = {
-			"dye:brown",
-			"homedecor:door_wood_glass_oak_left",
-			"homedecor:door_wood_glass_oak_left"
-        },
-})
-
--- white
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:door_wood_glass_white_left 2",
-        recipe = {
-			"dye:white",
-			"homedecor:door_wood_glass_oak_left",
-			"homedecor:door_wood_glass_oak_left"
-        },
-})
-
--- Closet doors
-
--- oak
-
-minetest.register_craft( {
-        output = "homedecor:door_closet_oak_left 2",
-        recipe = {
-			{ "", "group:stick", "group:stick" },
-			{ "default:steel_ingot", "group:stick", "group:stick" },
-			{ "", "group:stick", "group:stick" },
-        },
-})
-
--- mahogany
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:door_closet_mahogany_left 2",
-        recipe = {
-			"homedecor:door_closet_oak_left",
-			"homedecor:door_closet_oak_left",
-			"default:dirt",
-			"default:coal_lump",
-        },
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-        output = "homedecor:door_closet_mahogany_left 2",
-        recipe = {
-			"homedecor:door_closet_oak_left",
-			"homedecor:door_closet_oak_left",
-			"dye:brown"
-        },
-})
-
--- wrought fence-like door
-
-minetest.register_craft( {
-        output = "homedecor:door_wrought_iron_left 2",
-        recipe = {
-			{ "homedecor:pole_wrought_iron", "default:iron_lump" },
-			{ "homedecor:pole_wrought_iron", "default:iron_lump" },
-			{ "homedecor:pole_wrought_iron", "default:iron_lump" }
-        },
-})
-
--- bedroom door
-
-minetest.register_craft( {
-	output = "homedecor:door_bedroom_left",
-	recipe = {
-		{ "dye:white", "dye:white", "" },
-		{ "homedecor:door_wood_plain_left", "basic_materials:brass_ingot", "" },
-		{ "", "", "" },
-	},
-})
-
--- woodglass door
-
-minetest.register_craft( {
-	output = "homedecor:door_woodglass_left",
-	recipe = {
-		{ "group:wood", "default:glass", "" },
-		{ "group:wood", "default:glass", "basic_materials:brass_ingot" },
-		{ "group:wood", "group:wood", "" },
-	},
-})
-
--- woodglass door type 2
-
-minetest.register_craft( {
-	output = "homedecor:door_woodglass2_left",
-	recipe = {
-		{ "default:glass", "default:glass", "" },
-		{ "group:wood", "group:wood", "default:iron_lump" },
-		{ "group:wood", "group:wood", "" },
-	},
-})
-
--- laundry stuff
-
-minetest.register_craft( {
-    output = "homedecor:washing_machine",
-    recipe = {
-		{ "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" },
-		{ "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" },
-		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:washing_machine",
-    recipe = {
-		{ "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" },
-		{ "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" },
-		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dryer",
-    recipe = {
-		{ "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" },
-		{ "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" },
-		{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dryer",
-    recipe = {
-		{ "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" },
-		{ "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" },
-		{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:ironing_board",
-    recipe = {
-		{ "wool:grey", "wool:grey", "wool:grey"},
-		{ "", "default:steel_ingot", "" },
-		{ "default:steel_ingot", "", "default:steel_ingot" }
-    },
-})
-
--- dishwashers
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher",
-    recipe = {
-		{ "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot",  },
-		{ "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" },
-		{ "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" }
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher",
-    recipe = {
-		{ "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot",  },
-		{ "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" },
-		{ "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" }
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher_wood",
-    recipe = {
-		{ "stairs:slab_wood" },
-		{ "homedecor:dishwasher" },
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher_wood",
-    recipe = {
-		{ "moreblocks:slab_wood" },
-		{ "homedecor:dishwasher" },
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher_wood",
-    recipe = {
-		{ "moreblocks:slab_wood_1" },
-		{ "homedecor:dishwasher" },
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher_steel",
-    recipe = {
-		{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
-		{ "", "homedecor:dishwasher", "" },
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher_steel",
-    recipe = {
-		{ "moreblocks:slab_steelblock_1" },
-		{ "homedecor:dishwasher" },
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher_marble",
-    recipe = {
-		{ "building_blocks:slab_marble" },
-		{ "homedecor:dishwasher" },
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher_marble",
-    recipe = {
-		{ "technic:slab_marble_1" },
-		{ "homedecor:dishwasher" },
-    },
-})
-
-minetest.register_craft( {
-    output = "homedecor:dishwasher_granite",
-    recipe = {
-		{ "technic:slab_granite_1" },
-		{ "homedecor:dishwasher" },
-    },
-})
-
--- paintings
-
-minetest.register_craft({
-    output = "homedecor:blank_canvas",
-    recipe = {
-		{ "", "group:stick", "" },
-		{ "group:stick", "wool:white", "group:stick" },
-		{ "", "group:stick", "" },
-    }
-})
-
-local painting_patterns = {
-	[1] = {	{ "brown", "red", "brown" },
-			{ "dark_green", "red", "green" } },
-
-	[2] = {	{ "green", "yellow", "green" },
-			{ "green", "yellow", "green" } },
-
-	[3] = {	{ "green", "pink", "green" },
-			{ "brown", "pink", "brown" } },
-
-	[4] = {	{ "black", "orange", "grey" },
-			{ "dark_green", "orange", "orange" } },
-
-	[5] = {	{ "blue", "orange", "yellow" },
-			{ "green", "red", "brown" } },
-
-	[6] = {	{ "green", "red", "orange" },
-			{ "orange", "yellow", "green" } },
-
-	[7] = {	{ "blue", "dark_green", "dark_green" },
-			{ "green", "grey", "green" } },
-
-	[8] = {	{ "blue", "blue", "blue" },
-			{ "green", "green", "green" } },
-
-	[9] = {	{ "blue", "blue", "dark_green" },
-			{ "green", "grey", "dark_green" } },
-
-	[10] = { { "green", "white", "green" },
-			 { "dark_green", "white", "dark_green" } },
-
-	[11] = { { "blue", "white", "blue" },
-			 { "blue", "grey", "dark_green" } },
-
-	[12] = { { "green", "green", "green" },
-			 { "grey", "grey", "green" } },
-
-	[13] = { { "blue", "blue", "grey" },
-			 { "dark_green", "white", "white" } },
-
-	[14] = { { "red", "yellow", "blue" },
-			 { "blue", "green", "violet" } },
-
-	[15] = { { "blue", "yellow", "blue" },
-			 { "black", "black", "black" } },
-
-	[16] = { { "red", "orange", "blue" },
-			 { "black", "dark_grey", "grey" } },
-
-	[17] = { { "orange", "yellow", "orange" },
-			 { "black", "black", "black" } },
-
-	[18] = { { "grey", "dark_green", "grey" },
-			 { "white", "white", "white" } },
-
-	[19] = { { "white", "brown", "green" },
-			 { "green", "brown", "brown" } },
-
-	[20] = { { "blue", "blue", "blue" },
-			 { "red", "brown", "grey" } }
-}
-
-for i,recipe in pairs(painting_patterns) do
-
-	local item1 = "dye:"..recipe[1][1]
-	local item2 = "dye:"..recipe[1][2]
-	local item3 = "dye:"..recipe[1][3]
-	local item4 = "dye:"..recipe[2][1]
-	local item5 = "dye:"..recipe[2][2]
-	local item6 = "dye:"..recipe[2][3]
-
-	minetest.register_craft({
-		output = "homedecor:painting_"..i,
-		recipe = {
-			{ item1, item2, item3 },
-			{ item4, item5, item6 },
-			{"", "homedecor:blank_canvas", "" }
-		}
-	})
-end
-
--- more misc stuff here
-
-minetest.register_craft({
-        output = "homedecor:chimney 2",
-        recipe = {
-			{ "default:clay_brick", "", "default:clay_brick" },
-			{ "default:clay_brick", "", "default:clay_brick" },
-			{ "default:clay_brick", "", "default:clay_brick" },
-        },
-})
-
-minetest.register_craft({
-        output = "homedecor:fishtank",
-        recipe = {
-			{ "basic_materials:plastic_sheet", "homedecor:glowlight_small_cube", "basic_materials:plastic_sheet" },
-			{ "default:glass", "bucket:bucket_water", "default:glass" },
-			{ "default:glass", "building_blocks:gravel_spread", "default:glass" },
-        },
-	replacements = { {"bucket:bucket_water", "bucket:bucket_empty"} }
-})
-
-minetest.register_craft({
-    output = "homedecor:towel_rod",
-    recipe = {
-		{ "group:wood", "group:stick", "group:wood" },
-		{ "", "building_blocks:terrycloth_towel", "" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:toilet_paper",
-    recipe = {
-		{ "", "default:paper", "default:paper" },
-		{ "group:wood", "group:stick", "default:paper" },
-		{ "", "default:paper", "default:paper" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:medicine_cabinet",
-    recipe = {
-		{ "group:stick", "default:glass", "group:stick" },
-		{ "group:stick", "default:glass", "group:stick" },
-		{ "group:stick", "default:glass", "group:stick" }
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:cardboard_box 2",
-    recipe = {
-		{ "default:paper", "", "default:paper" },
-		{ "default:paper", "default:paper", "default:paper" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:cardboard_box_big 2",
-    recipe = {
-		{ "default:paper", "", "default:paper" },
-		{ "default:paper", "", "default:paper" },
-		{ "default:paper", "default:paper", "default:paper" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:desk",
-    recipe = {
-		{ "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" },
-		{ "homedecor:drawer_small", "default:wood", "default:wood" },
-		{ "homedecor:drawer_small", "", "default:wood" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:desk",
-    recipe = {
-		{ "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" },
-		{ "homedecor:drawer_small", "default:wood", "default:wood" },
-		{ "homedecor:drawer_small", "", "default:wood" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:filing_cabinet",
-    recipe = {
-		{ "", "default:wood", "" },
-		{ "default:wood", "homedecor:drawer_small", "default:wood" },
-		{ "", "default:wood", "" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:analog_clock_plastic 2",
-    recipe = {
-		{ "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:analog_clock_wood 2",
-    recipe = {
-		{ "group:stick", "dye:black", "group:stick" },
-		{ "group:stick", "basic_materials:ic", "group:stick" },
-		{ "group:stick", "dye:black", "group:stick" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:digital_clock 2",
-    recipe = {
-		{ "basic_materials:plastic_sheet", "default:paper", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:alarm_clock",
-    recipe = {
-		{ "basic_materials:plastic_sheet", "homedecor:speaker_driver", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "homedecor:digital_clock", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:air_conditioner",
-    recipe = {
-		{ "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" },
-		{ "default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor" },
-		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:air_conditioner",
-    recipe = {
-		{ "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" },
-		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" },
-		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:ceiling_fan",
-    recipe = {
-		{ "basic_materials:motor" },
-		{ "homedecor:fan_blades" },
-		{ "homedecor:glowlight_small_cube" }
-	}
-})
-
-minetest.register_craft({
-    output = "homedecor:ceiling_fan",
-    recipe = {
-		{ "basic_materials:motor" },
-		{ "homedecor:fan_blades" },
-		{ "homedecor:glowlight_small_cube" }
-	}
-})
-
-minetest.register_craft({
-    output = "homedecor:welcome_mat_grey 2",
-    recipe = {
-		{ "", "dye:black", "" },
-		{ "wool:grey", "wool:grey", "wool:grey" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:welcome_mat_brown 2",
-    recipe = {
-		{ "", "dye:black", "" },
-		{ "wool:brown", "wool:brown", "wool:brown" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:welcome_mat_green 2",
-    recipe = {
-		{ "", "dye:white", "" },
-		{ "wool:dark_green", "wool:dark_green", "wool:dark_green" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:welcome_mat_green 2",
-    recipe = {
-		{ "", "dye:white", "" },
-		{ "dye:black", "dye:black", "dye:black" },
-		{ "wool:green", "wool:green", "wool:green" },
-    },
-})
-
-minetest.register_craft({
-	type = "shapeless",
-    output = "homedecor:window_plain 8",
-    recipe = {
-		"dye:white",
-		"dye:white",
-		"dye:white",
-		"dye:white",
-		"building_blocks:woodglass"
-    }
-})
-
-minetest.register_craft({
-	type = "shapeless",
-    output = "homedecor:window_quartered",
-    recipe = {
-		"dye:white",
-		"group:stick",
-		"group:stick",
-		"homedecor:window_plain"
-    }
-})
-
-minetest.register_craft({
-    output = "homedecor:vcr 2",
-    recipe = {
-		{ "basic_materials:ic", "default:steel_ingot", "basic_materials:plastic_sheet" },
-		{ "default:iron_lump", "default:iron_lump", "default:iron_lump" },
-		{ "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:dvd_player 2",
-    recipe = {
-		{ "", "basic_materials:plastic_sheet", "" },
-		{ "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" },
-		{ "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:dvd_player 2",
-    recipe = {
-		{ "", "basic_materials:plastic_sheet", "" },
-		{ "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" },
-		{ "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" },
-    },
-})
-
-minetest.register_craft({
-	type = "shapeless",
-    output = "homedecor:dvd_vcr",
-    recipe = {
-		"homedecor:vcr",
-		"homedecor:dvd_player"
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:blinds_thin",
-    recipe = {
-		{ "group:stick", "basic_materials:plastic_sheet", "group:stick" },
-		{ "farming:string", "basic_materials:plastic_strip", "" },
-		{ "", "basic_materials:plastic_strip", "" },
-    },
-})
-
-minetest.register_craft({
-    output = "homedecor:blinds_thick",
-    recipe = {
-		{ "group:stick", "basic_materials:plastic_sheet", "group:stick" },
-		{ "farming:string", "basic_materials:plastic_strip", "basic_materials:plastic_strip" },
-		{ "", "basic_materials:plastic_strip", "basic_materials:plastic_strip" },
-    },
-})
-
-minetest.register_craft( {
-        output = "homedecor:openframe_bookshelf",
-        recipe = {
-			{"group:wood", "", "group:wood"},
-			{"default:book", "default:book", "default:book"},
-			{"group:wood", "", "group:wood"},
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:desk_fan",
-        recipe = {
-			{"default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor"},
-			{"", "default:steel_ingot", ""}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:space_heater",
-        recipe = {
-			{"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"},
-			{"basic_materials:plastic_sheet", "homedecor:fan_blades", "basic_materials:motor"},
-			{"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:radiator",
-        recipe = {
-			{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" },
-			{ "basic_materials:ic", "basic_materials:heating_element", "" },
-			{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }
-        },
-})
-
--- bathroom/kitchen tiles
-
-minetest.register_craft( {
-		output = "homedecor:bathroom_tiles_light 4",
-		recipe = {
-			{ "group:marble", "group:marble", "" },
-			{ "group:marble", "group:marble", "dye:white" }
-		},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:bathroom_tiles_light",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:bathroom_tiles_light",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft( {
-		output = "homedecor:bathroom_tiles_medium 4",
-		recipe = {
-			{ "group:marble", "group:marble", "" },
-			{ "group:marble", "group:marble", "dye:grey" }
-		},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:bathroom_tiles_medium",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:bathroom_tiles_medium",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft( {
-		output = "homedecor:bathroom_tiles_dark 4",
-		recipe = {
-			{ "group:marble", "group:marble", "" },
-			{ "group:marble", "group:marble", "dye:dark_grey" }
-		},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:bathroom_tiles_dark",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:bathroom_tiles_dark",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
--- misc electrical
-
-minetest.register_craft( {
-        output = "homedecor:power_outlet",
-        recipe = {
-			{"basic_materials:plastic_sheet", "basic_materials:copper_strip"},
-			{"basic_materials:plastic_sheet", ""},
-			{"basic_materials:plastic_sheet", "basic_materials:copper_strip"}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:light_switch",
-        recipe = {
-			{"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"},
-			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:copper_strip"},
-			{"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}
-        },
-})
-
--- doghouse
-
-minetest.register_craft( {
-        output = "homedecor:doghouse",
-        recipe = {
-			{"homedecor:shingles_terracotta", "homedecor:shingles_terracotta", "homedecor:shingles_terracotta"},
-			{"group:wood", "", "group:wood"},
-			{"group:wood", "building_blocks:terrycloth_towel", "group:wood"}
-        },
-})
-
--- japanese walls and mat
-
-minetest.register_craft( {
-        output = "homedecor:japanese_wall_top",
-        recipe = {
-			{"group:stick", "default:paper"},
-			{"default:paper", "group:stick"},
-			{"group:stick", "default:paper"}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:japanese_wall_top",
-        recipe = {
-			{"default:paper", "group:stick"},
-			{"group:stick", "default:paper"},
-			{"default:paper", "group:stick"}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:japanese_wall_middle",
-        recipe = {
-			{"homedecor:japanese_wall_top"}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:japanese_wall_bottom",
-        recipe = {
-			{"homedecor:japanese_wall_middle"}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:japanese_wall_top",
-        recipe = {
-			{"homedecor:japanese_wall_bottom"}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:tatami_mat",
-        recipe = {
-			{"farming:wheat", "farming:wheat", "farming:wheat"}
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:wardrobe",
-        recipe = {
-			{ "homedecor:drawer_small", "homedecor:kitchen_cabinet" },
-			{ "homedecor:drawer_small", "default:wood" },
-			{ "homedecor:drawer_small", "default:wood" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:pool_table",
-        recipe = {
-			{ "wool:dark_green", "wool:dark_green", "wool:dark_green" },
-			{ "building_blocks:hardwood", "building_blocks:hardwood", "building_blocks:hardwood" },
-			{ "building_blocks:slab_hardwood", "", "building_blocks:slab_hardwood" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:trash_can 3",
-        recipe = {
-			{ "basic_materials:steel_wire", "", "basic_materials:steel_wire" },
-			{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:telephone",
-        recipe = {
-			{ "homedecor:speaker_driver", "basic_materials:copper_wire", "homedecor:speaker_driver" },
-			{ "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" },
-			{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:cobweb_corner 5",
-        recipe = {
-			{ "farming:string", "", "farming:string" },
-			{ "", "farming:string", "" },
-			{ "farming:string", "", "farming:string" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:well",
-        recipe = {
-			{ "homedecor:shingles_wood", "homedecor:shingles_wood", "homedecor:shingles_wood" },
-			{ "group:wood", "group:stick", "group:wood" },
-			{ "group:stone", "", "group:stone" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:coat_tree",
-        recipe = {
-			{ "group:stick", "group:stick", "group:stick" },
-			{ "", "group:stick", "" },
-			{ "", "group:wood", "" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:coatrack_wallmount",
-        recipe = {
-			{ "group:stick", "homedecor:curtainrod_wood", "group:stick" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:doorbell",
-        recipe = {
-			{ "homedecor:light_switch", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" }
-        },
-})
-
-
-minetest.register_craft( {
-        output = "homedecor:bench_large_1",
-        recipe = {
-			{ "group:wood", "group:wood", "group:wood" },
-			{ "group:wood", "group:wood", "group:wood" },
-			{ "homedecor:pole_wrought_iron", "", "homedecor:pole_wrought_iron" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:bench_large_2_left",
-        recipe = {
-			{ "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" },
-			{ "group:wood", "group:wood", "group:wood" },
-			{ "stairs:slab_wood", "", "stairs:slab_wood" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:bench_large_2_left",
-        recipe = {
-			{ "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" },
-			{ "group:wood", "group:wood", "group:wood" },
-			{ "moreblocks:slab_wood", "", "moreblocks:slab_wood" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:kitchen_faucet",
-        recipe = {
-			{ "", "default:steel_ingot" },
-			{ "default:steel_ingot", "" },
-			{ "homedecor:taps", "" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:cutlery_set",
-        recipe = {
-			{ "", "vessels:drinking_glass", "" },
-			{ "basic_materials:steel_strip", "building_blocks:slab_marble", "basic_materials:steel_strip" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:cutlery_set",
-        recipe = {
-			{ "", "vessels:drinking_glass", "" },
-			{ "basic_materials:steel_strip", "building_blocks:micro_marble_1", "basic_materials:steel_strip" },
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:simple_bench",
-        recipe = {
-			{ "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" },
-			{ "stairs:slab_wood", "", "stairs:slab_wood" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:simple_bench",
-        recipe = {
-			{ "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" },
-			{ "moreblocks:slab_wood", "", "moreblocks:slab_wood" }
-        },
-})
-
-minetest.register_craft( {
-	output = "homedecor:bed_regular",
-	recipe = {
-		{ "group:stick", "", "group:stick" },
-		{ "wool:white", "wool:white", "wool:white" },
-		{ "group:wood", "", "group:wood" },
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:bed_regular",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:bed_regular",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft( {
-	output = "homedecor:bed_kingsize",
-	recipe = {
-		{ "homedecor:bed_regular", "homedecor:bed_regular" }
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:bed_kingsize",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:bed_kingsize",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:bed_kingsize",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:bed_regular",
-	recipe = {
-		"NEUTRAL_NODE",
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft( {
-        output = "homedecor:bottle_green",
-        recipe = {
-			{ "vessels:glass_bottle", "dye:green" }
-        },
-})
-
-minetest.register_craft( {
-        output = "homedecor:bottle_brown",
-        recipe = {
-			{ "vessels:glass_bottle", "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:dartboard",
-	recipe = {
-	    {"dye:black", "basic_materials:plastic_sheet", "dye:white"},
-	    {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"},
-	    {"dye:dark_green", "basic_materials:plastic_sheet", "dye:red"}
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:piano",
-	recipe = {
-		{ "", "basic_materials:steel_wire", "building_blocks:hardwood" },
-		{ "basic_materials:plastic_strip", "basic_materials:steel_wire", "building_blocks:hardwood" },
-		{ "basic_materials:brass_ingot", "default:steelblock", "building_blocks:hardwood" }
-	},
-})
-
-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({
-	output = "homedecor:deckchair",
-	recipe = {
-		{ "group:stick", "building_blocks:terrycloth_towel", "group:stick" },
-		{ "group:stick", "building_blocks:terrycloth_towel", "group:stick" },
-		{ "group:stick", "building_blocks:terrycloth_towel", "group:stick" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:deckchair_striped_blue",
-	type = "shapeless",
-	recipe = {
-		"homedecor:deckchair",
-		"dye:blue"
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:office_chair_basic",
-	recipe = {
-		{ "", "", "wool:black" },
-		{ "", "wool:black", "default:steel_ingot" },
-		{ "group:stick", "homedecor:pole_wrought_iron", "group:stick" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:office_chair_upscale",
-	recipe = {
-		{ "dye:black", "building_blocks:sticks", "group:wool" },
-		{ "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" },
-		{ "building_blocks:sticks", "homedecor:pole_wrought_iron", "building_blocks:sticks" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:wall_shelf 2",
-	recipe = {
-		{ "homedecor:wood_table_small_square", "homedecor:curtainrod_wood", "homedecor:curtainrod_wood" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:trophy 3",
-	recipe = {
-		{ "default:gold_ingot","","default:gold_ingot" },
-		{ "","default:gold_ingot","" },
-		{ "group:wood","default:gold_ingot","group:wood" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:grandfather_clock",
-	recipe = {
-		{ "building_blocks:slab_hardwood","homedecor:analog_clock_wood","building_blocks:slab_hardwood" },
-		{ "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" },
-		{ "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:sportbench",
-	recipe = {
-		{ "stairs:slab_steelblock","homedecor:pole_wrought_iron","stairs:slab_steelblock" },
-		{ "default:steel_ingot","wool:black","default:steel_ingot" },
-		{ "default:steel_ingot","wool:black","default:steel_ingot" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:skateboard",
-	recipe = {
-		{ "dye:yellow","dye:green","dye:blue" },
-		{ "homedecor:wood_table_small_square","homedecor:wood_table_small_square","homedecor:wood_table_small_square" },
-		{ "default:steel_ingot","","default:steel_ingot" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:copper_pans",
-	recipe = {
-		{ "basic_materials:copper_strip","","basic_materials:copper_strip" },
-		{ "default:copper_ingot","","default:copper_ingot" },
-		{ "default:copper_ingot","","default:copper_ingot" }
-	},
-})
-
-minetest.register_craft( {
-        output = "homedecor:window_flowerbox",
-        recipe = {
-                { "homedecor:roof_tile_terracotta", "default:dirt", "homedecor:roof_tile_terracotta" },
-                { "", "homedecor:roof_tile_terracotta", "" },
-        },
-})
-
-minetest.register_craft({
-    output = "homedecor:paper_towel",
-    recipe = {
-		{ "homedecor:toilet_paper", "homedecor:toilet_paper" }
-    },
-})
-
-minetest.register_craft({
-	output = "homedecor:stonepath 16",
-	recipe = {
-		{ "stairs:slab_stone","","stairs:slab_stone" },
-		{ "","stairs:slab_stone","" },
-		{ "stairs:slab_stone","","stairs:slab_stone" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:stonepath 16",
-	recipe = {
-		{ "moreblocks:slab_stone","","moreblocks:slab_stone" },
-		{ "","moreblocks:slab_stone","" },
-		{ "moreblocks:slab_stone","","moreblocks:slab_stone" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:stonepath 3",
-	recipe = {
-		{ "moreblocks:micro_stone_1","","moreblocks:micro_stone_1" },
-		{ "","moreblocks:micro_stone_1","" },
-		{ "moreblocks:micro_stone_1","","moreblocks:micro_stone_1" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:barbecue",
-	recipe = {
-		{ "","homedecor:fence_chainlink","" },
-		{ "default:steel_ingot","fake_fire:embers","default:steel_ingot" },
-		{ "homedecor:pole_wrought_iron","default:steel_ingot","homedecor:pole_wrought_iron" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:beer_tap",
-	recipe = {
-		{ "group:stick","default:steel_ingot","group:stick" },
-		{ "homedecor:kitchen_faucet","default:steel_ingot","homedecor:kitchen_faucet" },
-		{ "default:steel_ingot","default:steel_ingot","default:steel_ingot" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:swing",
-	recipe = {
-		{ "farming:string","","farming:string" },
-		{ "farming:string","","farming:string" },
-		{ "farming:string","stairs:slab_wood","farming:string" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:swing",
-	recipe = {
-		{ "farming:string","","farming:string" },
-		{ "farming:string","","farming:string" },
-		{ "farming:string","moreblocks:slab_wood","farming:string" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:swing",
-	recipe = {
-		{ "farming:string","","farming:string" },
-		{ "farming:string","","farming:string" },
-		{ "farming:string","moreblocks:panel_wood_1","farming:string" }
-	},
-})
-
-local bookcolors = {
-	"red",
-	"green",
-	"blue",
-	"violet",
-	"grey",
-	"brown"
-}
-
-for _, color in ipairs(bookcolors) do
-	minetest.register_craft({
-		type = "shapeless",
-		output = "homedecor:book_"..color,
-		recipe = {
-			"dye:"..color,
-			"default:book"
-		},
-	})
-end
-
-minetest.register_craft({
-	output = "homedecor:door_japanese_closed",
-	recipe = {
-		{ "homedecor:japanese_wall_top" },
-		{ "homedecor:japanese_wall_bottom" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:calendar",
-	recipe = {
-		{ "","dye:red","" },
-		{ "","dye:black","" },
-		{ "","default:paper","" }
-	},
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:4_bottles_brown",
-	recipe = {
-		"homedecor:bottle_brown",
-		"homedecor:bottle_brown",
-		"homedecor:bottle_brown",
-		"homedecor:bottle_brown"
-	},
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:4_bottles_green",
-	recipe = {
-		"homedecor:bottle_green",
-		"homedecor:bottle_green",
-		"homedecor:bottle_green",
-		"homedecor:bottle_green"
-	},
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:4_bottles_multi",
-	recipe = {
-		"homedecor:bottle_brown",
-		"homedecor:bottle_brown",
-		"homedecor:bottle_green",
-		"homedecor:bottle_green",
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:wine_rack",
-	recipe = {
-		{ "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" },
-		{ "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" },
-		{ "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" },
-	},
-})
-
-local picture_dyes = {
-	{"dye:brown", "dye:green"}, -- the figure sitting by the tree, wielding a pick
-	{"dye:green", "dye:blue"}	-- the "family photo"
-}
-
-for i in ipairs(picture_dyes) do
-	minetest.register_craft({
-		output = "homedecor:picture_frame"..i,
-		recipe = {
-			{ picture_dyes[i][1], picture_dyes[i][2] },
-			{ "homedecor:blank_canvas", "group:stick" },
-		},
-	})
-end
-
-minetest.register_craft({
-	output = "homedecor:desk_lamp 2",
-	recipe = {
-		{ "", "default:steel_ingot", "homedecor:glowlight_small_cube" },
-		{ "", "basic_materials:steel_strip", "" },
-		{ "basic_materials:plastic_sheet", "basic_materials:copper_wire", "basic_materials:plastic_sheet" },
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:desk_lamp",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:desk_lamp",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:hanging_lantern 2",
-	recipe = {
-		{ "default:iron_lump", "default:iron_lump", "" },
-		{ "default:iron_lump", "homedecor:lattice_lantern_large", "" },
-		{ "default:iron_lump", "", "" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:ceiling_lantern 2",
-	recipe = {
-		{ "default:iron_lump", "default:iron_lump", "default:iron_lump" },
-		{ "default:iron_lump", "homedecor:lattice_lantern_large", "default:iron_lump" },
-		{ "", "default:iron_lump", "" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:wall_lamp 2",
-	recipe = {
-		{ "", "homedecor:lattice_lantern_large", "" },
-		{ "default:iron_lump", "group:stick", "" },
-		{ "default:iron_lump", "group:stick", "" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:desk_globe",
-	recipe = {
-		{ "group:stick", "basic_materials:plastic_sheet", "dye:green" },
-		{ "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "group:stick", "stairs:slab_wood", "dye:blue" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:desk_globe",
-	recipe = {
-		{ "group:stick", "basic_materials:plastic_sheet", "dye:green" },
-		{ "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "group:stick", "moreblocks:slab_wood", "dye:blue" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:tool_cabinet",
-	recipe = {
-		{ "basic_materials:motor", "default:axe_steel", "default:pick_steel" },
-		{ "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" },
-		{ "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:bathroom_set",
-	recipe = {
-		{ "", "homedecor:glass_table_small_round", "" },
-		{ "basic_materials:plastic_sheet", "homedecor:glass_table_small_round", "basic_materials:plastic_sheet" },
-		{ "group:stick", "basic_materials:plastic_sheet", "group:stick" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:trash_can_green",
-	recipe = {
-		{ "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "dye:green", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:ceiling_lamp",
-	recipe = {
-		{ "", "basic_materials:brass_ingot", ""},
-		{ "", "basic_materials:chainlink_brass", ""},
-		{ "default:glass", "homedecor:glowlight_small_cube", "default:glass"}
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:ceiling_lamp",
-	recipe = {
-		{ "", "basic_materials:chain_steel_top_brass", ""},
-		{ "default:glass", "homedecor:glowlight_small_cube", "default:glass"}
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:spiral_staircase",
-	recipe = {
-		{ "default:steelblock", "homedecor:pole_wrought_iron", "" },
-		{ "", "homedecor:pole_wrought_iron", "default:steelblock" },
-		{ "default:steelblock", "homedecor:pole_wrought_iron", "" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:soda_machine",
-	recipe = {
-		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
-		{"default:steel_ingot", "dye:red", "default:steel_ingot"},
-		{"default:steel_ingot", "default:copperblock", "default:steel_ingot"},
-	},
-})
-
-if minetest.settings:get_bool("homedecor.disable_coin_crafting") == false then
-	minetest.register_craft({
-		type = "shapeless",
-		output = "homedecor:coin 5",
-		recipe = {"moreblocks:micro_goldblock_1", "default:sword_stone"}
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = "homedecor:coin 15",
-		recipe = {"default:gold_ingot", "default:sword_steel"}
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = "homedecor:coin 50",
-		recipe = {"default:goldblock", "default:sword_mese"}
-	})
-else
-	if minetest.settings:get("log_mods") then
-		minetest.log("[HomeDecor] " .. S("coin crafting is disabled!"))
-	end
-end
-
-minetest.register_craft({
-	output = "homedecor:lattice_wood 8",
-	recipe = {
-		{"group:stick", "group:wood", "group:stick"},
-		{"group:wood", "", "group:wood"},
-		{"group:stick", "group:wood", "group:stick"},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:lattice_white_wood 8",
-	recipe = {
-		{"group:stick", "group:wood", "group:stick"},
-		{"group:wood", "dye:white", "group:wood"},
-		{"group:stick", "group:wood", "group:stick"},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:lattice_wood_vegetal 8",
-	recipe = {
-		{"group:stick", "group:wood", "group:stick"},
-		{"group:wood", "group:leaves", "group:wood"},
-		{"group:stick", "group:wood", "group:stick"},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:lattice_white_wood_vegetal 8",
-	recipe = {
-		{"group:stick", "group:wood", "group:stick"},
-		{"group:wood", "group:leaves", "group:wood"},
-		{"group:stick", "dye:white", "group:stick"},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:stained_glass 8",
-	recipe = {
-		{"", "dye:blue", ""},
-		{"dye:red", "default:glass", "dye:green"},
-		{"", "dye:yellow", ""},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:stained_glass 3",
-	recipe = {
-		{"", "dye:blue", ""},
-		{"dye:red", "xpanes:pane_flat", "dye:green"},
-		{"", "dye:yellow", ""},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:stained_glass 2",
-	recipe = {
-		{"", "dye:blue", ""},
-		{"dye:red", "cottages:glass_pane_side", "dye:green"},
-		{"", "dye:yellow", ""},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:stained_glass 2",
-	recipe = {
-		{"", "dye:blue", ""},
-		{"dye:red", "cottages:glass_pane", "dye:green"},
-		{"", "dye:yellow", ""},
-	},
-})
-
-minetest.register_craftitem("homedecor:flower_pot_small", {
-	description = S("Small Flower Pot"),
-	inventory_image = "homedecor_flowerpot_small_inv.png"
-})
-
-minetest.register_craft( {
-	output = "homedecor:flower_pot_small",
-	recipe = {
-	        { "default:clay_brick", "", "default:clay_brick" },
-	        { "", "default:clay_brick", "" }
-	}
-})
-
-minetest.register_craft( {
-	output = "homedecor:flower_pot_small 3",
-	recipe = { { "homedecor:flower_pot_terracotta" } }
-})
-
-minetest.register_craft({
-	output = "homedecor:shrubbery_green 3",
-	recipe = {
-		{ "group:leaves", "group:leaves", "group:leaves" },
-		{ "group:leaves", "group:leaves", "group:leaves" },
-		{ "group:stick", "group:stick", "group:stick" }
-	}
-})
-
-for _, color in ipairs(homedecor.shrub_colors) do
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = "homedecor:shrubbery_large_"..color,
-		recipe = {
-			"homedecor:shrubbery_"..color
-		}
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = "homedecor:shrubbery_"..color,
-		recipe = {
-			"homedecor:shrubbery_large_"..color
-		}
-	})
-
-	if color ~= "green" then
-		minetest.register_craft({
-			type = "shapeless",
-			output = "homedecor:shrubbery_large_"..color,
-			recipe = {
-				"homedecor:shrubbery_large_green",
-				"dye:"..color
-			}
-		})
-
-		minetest.register_craft({
-			type = "shapeless",
-			output = "homedecor:shrubbery_"..color,
-			recipe = {
-				"homedecor:shrubbery_green",
-				"dye:"..color
-			}
-		})
-
-	end
-end
-
-for i in ipairs(homedecor.banister_materials) do
-
-	local name    = homedecor.banister_materials[i][1]
-	local topmat  = homedecor.banister_materials[i][5]
-	local vertmat = homedecor.banister_materials[i][6]
-	local dye1    = homedecor.banister_materials[i][7]
-	local dye2    = homedecor.banister_materials[i][8]
-
-	minetest.register_craft({
-		output = "homedecor:banister_"..name.."_horizontal 2",
-		recipe = {
-			{ topmat,  "",      dye1   },
-			{ vertmat, topmat,  ""     },
-			{ dye2,    vertmat, topmat }
-		},
-	})
-end
-
-unifieddyes.register_color_craft({
-	output = "",
-	palette = "split",
-	neutral_node = "homedecor:banister_wood_horizontal",
-	type = "shapeless",
-	output_prefix = "homedecor:banister_wood_horizontal_",
-	output_suffix = "",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE",
-	}
-})
-
-if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then
-	technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"basic_materials:oil_extract 2","dye:yellow 1"} })
-end
diff --git a/homedecor/depends.txt b/homedecor/depends.txt
deleted file mode 100644
index ec57479..0000000
--- a/homedecor/depends.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-default
-basic_materials
-unifieddyes
-homedecor_i18n
-creative
-currency?
-building_blocks?
-signs_lib?
-moreblocks?
-technic?
-dye?
-bees?
-bucket?
-beds?
-flowers?
-3d_armor?
-skinsdb?
-mesecons?
-darkage?
diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua
deleted file mode 100644
index cfcc6fc..0000000
--- a/homedecor/electronics.lua
+++ /dev/null
@@ -1,143 +0,0 @@
--- Various home electronics
-
-local S = homedecor_i18n.gettext
-
-homedecor.register("speaker", {
-	description = S("Large Stereo Speaker"),
-	mesh="homedecor_speaker_large.obj",
-	tiles = {
-		"homedecor_speaker_sides.png",
-		"homedecor_speaker_front.png"
-	},
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		minetest.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2})
-	end
-})
-
-homedecor.register("speaker_open", {
-	description = S("Large Stereo Speaker, open front"),
-	mesh="homedecor_speaker_large_open.obj",
-	tiles = {
-		"homedecor_speaker_sides.png",
-		"homedecor_speaker_driver.png",
-		"homedecor_speaker_open_front.png",
-		{ name = "homedecor_generic_metal.png", color = homedecor.color_black }
-	},
-	groups = { snappy = 3, not_in_creative_inventory=1 },
-	sounds = default.node_sound_wood_defaults(),
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2})
-	end
-})
-
-local spk_cbox = {
-	type = "fixed",
-	fixed = { -3/16, -8/16, 1/16, 3/16, -2/16, 7/16 }
-}
-
-homedecor.register("speaker_small", {
-	description = S("Small Surround Speaker"),
-	mesh="homedecor_speaker_small.obj",
-	tiles = {
-		"homedecor_speaker_sides.png",
-		"homedecor_speaker_front.png"
-	},
-	selection_box = spk_cbox,
-	walkable = false,
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-})
-
-homedecor.register("stereo", {
-	description = S("Stereo Receiver"),
-	tiles = { 'homedecor_stereo_top.png',
-			'homedecor_stereo_bottom.png',
-			'homedecor_stereo_left.png^[transformFX',
-			'homedecor_stereo_left.png',
-			'homedecor_stereo_back.png',
-			'homedecor_stereo_front.png'},
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-})
-
-homedecor.register("projection_screen", {
-	description = S("Projection Screen Material"),
-	drawtype = 'signlike',
-	tiles = { 'homedecor_projection_screen.png' },
-	wield_image = 'homedecor_projection_screen_inv.png',
-	inventory_image = 'homedecor_projection_screen_inv.png',
-	walkable = false,
-	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
-	paramtype2 = 'wallmounted',
-	selection_box = {
-		type = "wallmounted",
-		--wall_side = = <default>
-	},
-})
-
-homedecor.register("television", {
-	description = S("Small CRT Television"),
-	tiles = { 'homedecor_television_top.png',
-		  'homedecor_television_bottom.png',
-		  'homedecor_television_left.png^[transformFX',
-		  'homedecor_television_left.png',
-		  'homedecor_television_back.png',
-		   { name="homedecor_television_front_animated.png",
-			  animation={
-				type="vertical_frames",
-				aspect_w=16,
-				aspect_h=16,
-				length=80.0
-			  }
-		   }
-	},
-	light_source = default.LIGHT_MAX - 1,
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-})
-
-homedecor.register("dvd_vcr", {
-	description = S("DVD and VCR"),
-	tiles = {
-		"homedecor_dvdvcr_top.png",
-		"homedecor_dvdvcr_bottom.png",
-		"homedecor_dvdvcr_sides.png",
-		"homedecor_dvdvcr_sides.png^[transformFX",
-		"homedecor_dvdvcr_back.png",
-		"homedecor_dvdvcr_front.png",
-	},
-	inventory_image = "homedecor_dvdvcr_inv.png",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.3125, -0.5, -0.25, 0.3125, -0.375, 0.1875},
-			{-0.25, -0.5, -0.25, 0.25, -0.1875, 0.125},
-		}
-	},
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-})
-
-local tel_cbox = {
-	type = "fixed",
-	fixed = { -0.25, -0.5, -0.1875, 0.25, -0.21, 0.15 }
-}
-
-homedecor.register("telephone", {
-	mesh = "homedecor_telephone.obj",
-	tiles = {
-		"homedecor_telephone_dial.png",
-		"homedecor_telephone_base.png",
-		"homedecor_telephone_handset.png",
-		"homedecor_telephone_cord.png",
-	},
-	inventory_image = "homedecor_telephone_inv.png",
-	description = S("Telephone"),
-	groups = {snappy=3},
-	selection_box = tel_cbox,
-	walkable = false,
-	sounds = default.node_sound_wood_defaults(),
-})
diff --git a/homedecor/furniture_recipes.lua b/homedecor/furniture_recipes.lua
deleted file mode 100644
index aeceeef..0000000
--- a/homedecor/furniture_recipes.lua
+++ /dev/null
@@ -1,280 +0,0 @@
-
-minetest.register_craft({
-	output = "homedecor:table",
-	recipe = {
-		{ "default:wood","default:wood", "default:wood" },
-		{ "group:stick", "", "group:stick" },
-	},
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:table_mahogany",
-	recipe = {
-		"homedecor:table",
-		"dye:brown",
-	},
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:table_mahogany",
-	recipe = {
-		"homedecor:table",
-		"unifieddyes:dark_orange",
-	},
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:table_white",
-	recipe = {
-		"homedecor:table",
-		"dye:white",
-	},
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:table",
-	burntime = 30,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:table_mahogany",
-	burntime = 30,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:table_white",
-	burntime = 30,
-})
-
-minetest.register_craft({
-	output = "homedecor:kitchen_chair_wood 2",
-	recipe = {
-		{ "group:stick",""},
-		{ "group:wood","group:wood" },
-		{ "group:stick","group:stick" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:armchair 2",
-	recipe = {
-	{ "wool:white",""},
-	{ "group:wood","group:wood" },
-	{ "wool:white","wool:white" },
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:armchair",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:armchair",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "homedecor:kitchen_chair_padded",
-	recipe = {
-		"homedecor:kitchen_chair_wood",
-		"wool:white",
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:kitchen_chair_padded",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:kitchen_chair_padded",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:kitchen_chair_wood",
-	burntime = 15,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:kitchen_chair_padded",
-	burntime = 15,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:armchair",
-	burntime = 30,
-})
-
-minetest.register_craft({
-	output = "homedecor:standing_lamp_off",
-	recipe = {
-		{"homedecor:table_lamp_off"},
-		{"group:stick"},
-		{"group:stick"},
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:standing_lamp_off",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:standing_lamp_off",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "homedecor:table_lamp_off",
-	burntime = 10,
-})
-
-minetest.register_craft({
-	output = "homedecor:table_lamp_off",
-	recipe = {
-		{ "wool:white", "default:torch", "wool:white"},
-		{ "", "group:stick", ""},
-		{ "", "stairs:slab_wood", "" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:table_lamp_off",
-	recipe = {
-		{ "cottages:wool", "default:torch", "cottages:wool"},
-		{ "", "group:stick", ""},
-		{ "", "stairs:slab_wood", "" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:table_lamp_off",
-	recipe = {
-		{ "wool:white", "default:torch", "wool:white"},
-		{ "", "group:stick", ""},
-		{ "", "moreblocks:slab_wood", "" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:table_lamp_off",
-	recipe = {
-		{ "cottages:wool", "default:torch", "cottages:wool"},
-		{ "", "group:stick", ""},
-		{ "", "moreblocks:slab_wood", "" },
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:table_lamp_off",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:table_lamp_off",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-minetest.register_craft({
-	output = "homedecor:toilet",
-	recipe = {
-		{ "","","bucket:bucket_water"},
-		{ "group:marble","group:marble", "group:marble" },
-		{ "", "bucket:bucket_empty", "" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:sink",
-	recipe = {
-		{ "group:marble","bucket:bucket_empty", "group:marble" },
-		{ "", "group:marble", "" }
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:taps",
-	recipe = {
-		{ "default:steel_ingot","bucket:bucket_water", "default:steel_ingot" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:taps_brass",
-	recipe = {
-		{ "technic:brass_ingot","bucket:bucket_water", "technic:brass_ingot" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:shower_tray",
-	recipe = {
-		{ "group:marble","bucket:bucket_empty", "group:marble" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:shower_head",
-	recipe = {
-		{"default:steel_ingot", "bucket:bucket_water"},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:bathtub_clawfoot_brass_taps",
-	recipe = {
-		{ "homedecor:taps_brass", "", "" },
-		{ "group:marble", "", "group:marble" },
-		{"default:steel_ingot", "group:marble", "default:steel_ingot"},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:bathtub_clawfoot_chrome_taps",
-	recipe = {
-		{ "homedecor:taps", "", "" },
-		{ "group:marble", "", "group:marble" },
-		{"default:steel_ingot", "group:marble", "default:steel_ingot"},
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:bars 6",
-	recipe = {
-		{ "default:steel_ingot","default:steel_ingot","default:steel_ingot" },
-		{ "homedecor:pole_wrought_iron","homedecor:pole_wrought_iron","homedecor:pole_wrought_iron" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:L_binding_bars 3",
-	recipe = {
-		{ "homedecor:bars","" },
-		{ "homedecor:bars","homedecor:bars" },
-	},
-})
-
-minetest.register_craft({
-	output = "homedecor:torch_wall 10",
-	recipe = {
-		{ "default:coal_lump" },
-		{ "default:steel_ingot" },
-	},
-})
diff --git a/homedecor/handlers/init.lua b/homedecor/handlers/init.lua
deleted file mode 100644
index 05c27f4..0000000
--- a/homedecor/handlers/init.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local handlerpath = homedecor.modpath .. "/handlers/"
-
--- nodebox arithmetics and helpers
--- (please keep non-generic nodeboxes with their node definition)
-dofile(handlerpath.."nodeboxes.lua")
-
--- expand and unexpand decor
-dofile(handlerpath.."expansion.lua")
-
--- register nodes that cook stuff
-dofile(handlerpath.."furnaces.lua")
-
--- inventory related functionality, like initialization, ownership and spawning locked versions
-dofile(handlerpath.."inventory.lua")
-
--- glue it all together into a registration function
-dofile(handlerpath.."registration.lua")
-
--- some nodes have particle spawners
-dofile(handlerpath.."water_particles.lua")
-
-
-dofile(handlerpath.."mt_game_beds_functions.lua")
-dofile(handlerpath.."sit.lua")
diff --git a/homedecor/kitchen_appliances.lua b/homedecor/kitchen_appliances.lua
deleted file mode 100644
index 1caa1ec..0000000
--- a/homedecor/kitchen_appliances.lua
+++ /dev/null
@@ -1,256 +0,0 @@
--- This file supplies refrigerators
-
-local S = homedecor_i18n.gettext
-
-local function N_(x) return x end
-
--- steel-textured fridge
-homedecor.register("refrigerator_steel", {
-	mesh = "homedecor_refrigerator.obj",
-	tiles = { "homedecor_refrigerator_steel.png" },
-	inventory_image = "homedecor_refrigerator_steel_inv.png",
-	description = S("Refrigerator (stainless steel)"),
-	groups = {snappy=3},
-	sounds = default.node_sound_stone_defaults(),
-	selection_box = homedecor.nodebox.slab_y(2),
-	collision_box = homedecor.nodebox.slab_y(2),
-	expand = { top="placeholder" },
-	infotext=S("Refrigerator"),
-	inventory = {
-		size=50,
-		lockable=true,
-	},
-	on_rotate = screwdriver.rotate_simple
-})
-
--- white, enameled fridge
-homedecor.register("refrigerator_white", {
-	mesh = "homedecor_refrigerator.obj",
-	tiles = { "homedecor_refrigerator_white.png" },
-	inventory_image = "homedecor_refrigerator_white_inv.png",
-	description = S("Refrigerator"),
-	groups = {snappy=3},
-	selection_box = homedecor.nodebox.slab_y(2),
-	collision_box = homedecor.nodebox.slab_y(2),
-	sounds = default.node_sound_stone_defaults(),
-	expand = { top="placeholder" },
-	infotext=S("Refrigerator"),
-	inventory = {
-		size=50,
-		lockable=true,
-	},
-	on_rotate = screwdriver.rotate_simple
-})
-
-minetest.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white")
-minetest.register_alias("homedecor:refrigerator_white_top", "air")
-
-minetest.register_alias("homedecor:refrigerator_steel_bottom", "homedecor:refrigerator_steel")
-minetest.register_alias("homedecor:refrigerator_steel_top", "air")
-
-minetest.register_alias("homedecor:refrigerator_white_bottom_locked", "homedecor:refrigerator_white_locked")
-minetest.register_alias("homedecor:refrigerator_white_top_locked", "air")
-minetest.register_alias("homedecor:refrigerator_locked", "homedecor:refrigerator_white_locked")
-
-minetest.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor:refrigerator_steel_locked")
-minetest.register_alias("homedecor:refrigerator_steel_top_locked", "air")
-
--- kitchen "furnaces"
-homedecor.register_furnace("oven", {
-	description = S("Oven"),
-	tile_format = "homedecor_oven_%s%s.png",
-	output_slots = 4,
-	output_width = 2,
-	cook_speed = 1.25,
-})
-
-homedecor.register_furnace("oven_steel", {
-	description = S("Oven (stainless steel)"),
-	tile_format = "homedecor_oven_steel_%s%s.png",
-	output_slots = 4,
-	output_width = 2,
-	cook_speed = 1.25,
-})
-
-homedecor.register_furnace("microwave_oven", {
-	description = S("Microwave Oven"),
-	tiles = {
-		"homedecor_microwave_top.png", "homedecor_microwave_top.png^[transformR180",
-		"homedecor_microwave_top.png^[transformR270", "homedecor_microwave_top.png^[transformR90",
-		"homedecor_microwave_top.png^[transformR180", "homedecor_microwave_front.png"
-	},
-	tiles_active = {
-		"homedecor_microwave_top.png", "homedecor_microwave_top.png^[transformR180",
-		"homedecor_microwave_top.png^[transformR270", "homedecor_microwave_top.png^[transformR90",
-		"homedecor_microwave_top.png^[transformR180", "homedecor_microwave_front_active.png"
-	},
-	output_slots = 2,
-	output_width = 2,
-	cook_speed = 1.5,
-	extra_nodedef_fields = {
-		node_box = {
-			type = "fixed",
-			fixed = { -0.5, -0.5, -0.125, 0.5, 0.125, 0.5 },
-		},
-	},
-})
-
--- coffee!
--- coffee!
--- coffee!
-
-local cm_cbox = {
-	type = "fixed",
-	fixed = {
-		{     0, -8/16,     0,  7/16,  3/16,  8/16 },
-		{ -4/16, -8/16, -6/16, -1/16, -5/16, -3/16 }
-	}
-}
-
-homedecor.register("coffee_maker", {
-	mesh = "homedecor_coffeemaker.obj",
-	tiles = {
-		"homedecor_coffeemaker_decanter.png",
-		"homedecor_coffeemaker_cup.png",
-		"homedecor_coffeemaker_case.png",
-	},
-	description = S("Coffee Maker"),
-	inventory_image = "homedecor_coffeemaker_inv.png",
-	walkable = false,
-	groups = {snappy=3},
-	selection_box = cm_cbox,
-	node_box = cm_cbox,
-	on_rotate = screwdriver.disallow
-})
-
-local fdir_to_steampos = {
-	x = { 0.15,   0.275, -0.15,  -0.275 },
-	z = { 0.275, -0.15,  -0.275,  0.15  }
-}
-
-minetest.register_abm({
-	nodenames = "homedecor:coffee_maker",
-	label = "sfx",
-	interval = 2,
-	chance = 1,
-	action = function(pos, node)
-		local fdir = node.param2
-		if fdir and fdir < 4 then
-
-			local steamx = fdir_to_steampos.x[fdir + 1]
-			local steamz = fdir_to_steampos.z[fdir + 1]
-
-			minetest.add_particlespawner({
-				amount = 1,
-				time = 1,
-				minpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz},
-				maxpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz},
-				minvel = {x=-0.003, y=0.01, z=-0.003},
-				maxvel = {x=0.003, y=0.01, z=-0.003},
-				minacc = {x=0.0,y=-0.0,z=-0.0},
-				maxacc = {x=0.0,y=0.003,z=-0.0},
-				minexptime = 2,
-				maxexptime = 5,
-				minsize = 1,
-				maxsize = 1.2,
-				collisiondetection = false,
-				texture = "homedecor_steam.png",
-			})
-		end
-	end
-})
-
-homedecor.register("toaster", {
-	description = S("Toaster"),
-	tiles = { "homedecor_toaster_sides.png" },
-	inventory_image = "homedecor_toaster_inv.png",
-	walkable = false,
-	groups = { snappy=3 },
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.0625, -0.5, -0.125, 0.125, -0.3125, 0.125}, -- NodeBox1
-		},
-	},
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		local fdir = node.param2
-		minetest.set_node(pos, { name = "homedecor:toaster_loaf", param2 = fdir })
-		minetest.sound_play("toaster", {
-			pos = pos,
-			gain = 1.0,
-			max_hear_distance = 5
-		})
-		return itemstack
-	end
-})
-
-homedecor.register("toaster_loaf", {
-	tiles = {
-		"homedecor_toaster_toploaf.png",
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png"
-	},
-	walkable = false,
-	groups = { snappy=3, not_in_creative_inventory=1 },
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.0625, -0.5, -0.125, 0.125, -0.3125, 0.125}, -- NodeBox1
-			{-0.03125, -0.3125, -0.0935, 0, -0.25, 0.0935}, -- NodeBox2
-			{0.0625, -0.3125, -0.0935, 0.0935, -0.25, 0.0935}, -- NodeBox3
-		},
-	},
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		local fdir = node.param2
-		minetest.set_node(pos, { name = "homedecor:toaster", param2 = fdir })
-		return itemstack
-	end,
-	drop = "homedecor:toaster"
-})
-
-
-homedecor.register("dishwasher", {
-	description = S("Dishwasher"),
-	drawtype = "nodebox",
-	tiles = {
-		"homedecor_dishwasher_top.png",
-		"homedecor_dishwasher_bottom.png",
-		"homedecor_dishwasher_sides.png",
-		"homedecor_dishwasher_sides.png^[transformFX",
-		"homedecor_dishwasher_back.png",
-		"homedecor_dishwasher_front.png"
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
-			{-0.5, -0.5, -0.5, 0.5, 0.5, -0.4375},
-			{-0.5, -0.5, -0.5, 0.5, 0.1875, 0.1875},
-			{-0.4375, -0.5, -0.5, 0.4375, 0.4375, 0.4375},
-		}
-	},
-	selection_box = { type = "regular" },
-	sounds = default.node_sound_stone_defaults(),
-	groups = { snappy = 3 },
-})
-
-local materials = { N_("granite"), N_("marble"), N_("steel"), N_("wood") }
-
-for _, m in ipairs(materials) do
-homedecor.register("dishwasher_"..m, {
-	description = S("Dishwasher (@1)", S(m)),
-	tiles = {
-		"homedecor_kitchen_cabinet_top_"..m..".png",
-		"homedecor_dishwasher_bottom.png",
-		"homedecor_dishwasher_sides.png",
-		"homedecor_dishwasher_sides.png^[transformFX",
-		"homedecor_dishwasher_back.png",
-		"homedecor_dishwasher_front.png"
-	},
-	groups = { snappy = 3 },
-	sounds = default.node_sound_stone_defaults(),
-})
-end
diff --git a/homedecor/kitchen_furniture.lua b/homedecor/kitchen_furniture.lua
deleted file mode 100644
index 2ecb7bf..0000000
--- a/homedecor/kitchen_furniture.lua
+++ /dev/null
@@ -1,157 +0,0 @@
--- This file supplies Kitchen cabinets and kitchen sink
-
-local S = homedecor_i18n.gettext
-
-local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png"
-local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)"
-
-local function N_(x) return x end
-
-local counter_materials = { "", N_("granite"), N_("marble"), N_("steel") }
-
-for _, mat in ipairs(counter_materials) do
-
-	local desc = S("Kitchen Cabinet")
-	local material = ""
-
-	if mat ~= "" then
-		desc = S("Kitchen Cabinet (@1 top)", S(mat))
-		material = "_"..mat
-	end
-
-	homedecor.register("kitchen_cabinet"..material, {
-		description = desc,
-		tiles = { 'homedecor_kitchen_cabinet_top'..material..'.png',
-				cabinet_bottom,
-				cabinet_sides,
-				cabinet_sides,
-				cabinet_sides,
-				'homedecor_kitchen_cabinet_front.png'},
-		groups = { snappy = 3 },
-		sounds = default.node_sound_wood_defaults(),
-		infotext=S("Kitchen Cabinet"),
-		inventory = {
-			size=24,
-			lockable=true,
-		},
-	})
-end
-
-local kitchen_cabinet_half_box = homedecor.nodebox.slab_y(0.5, 0.5)
-homedecor.register("kitchen_cabinet_half", {
-	description = S('Half-height Kitchen Cabinet (on ceiling)'),
-	tiles = {
-		cabinet_sides,
-		cabinet_bottom,
-		cabinet_sides,
-		cabinet_sides,
-		cabinet_sides,
-		'homedecor_kitchen_cabinet_front_half.png'
-	},
-	selection_box = kitchen_cabinet_half_box,
-	node_box = kitchen_cabinet_half_box,
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-	infotext=S("Kitchen Cabinet"),
-	inventory = {
-		size=12,
-		lockable=true,
-	},
-})
-
-homedecor.register("kitchen_cabinet_with_sink", {
-	description = S("Kitchen Cabinet with sink"),
-	mesh = "homedecor_kitchen_sink.obj",
-	tiles = {
-		"homedecor_kitchen_sink_top.png",
-		"homedecor_kitchen_cabinet_front.png",
-		cabinet_sides,
-		cabinet_bottom
-	},
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-	infotext=S("Under-sink cabinet"),
-	inventory = {
-		size=16,
-		lockable=true,
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{ -8/16, -8/16, -8/16,  8/16, 6/16,  8/16 },
-			{ -8/16,  6/16, -8/16, -6/16, 8/16,  8/16 },
-			{  6/16,  6/16, -8/16,  8/16, 8/16,  8/16 },
-			{ -8/16,  6/16, -8/16,  8/16, 8/16, -6/16 },
-			{ -8/16,  6/16,  6/16,  8/16, 8/16,  8/16 },
-		}
-	},
-	on_destruct = function(pos)
-		homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z})
-	end
-})
-
-local cp_cbox = {
-	type = "fixed",
-	fixed = { -0.375, -0.5, -0.5, 0.375, -0.3125, 0.3125 }
-}
-
-homedecor.register("copper_pans", {
-	description = S("Copper pans"),
-	mesh = "homedecor_copper_pans.obj",
-	tiles = { "homedecor_polished_copper.png" },
-	inventory_image = "homedecor_copper_pans_inv.png",
-	groups = { snappy=3 },
-	selection_box = cp_cbox,
-	walkable = false,
-	on_place = minetest.rotate_node
-})
-
-local kf_cbox = {
-	type = "fixed",
-	fixed = { -2/16, -8/16, 1/16, 2/16, -1/16, 8/16 }
-}
-
-homedecor.register("kitchen_faucet", {
-	mesh = "homedecor_kitchen_faucet.obj",
-	tiles = { "homedecor_generic_metal_bright.png" },
-	inventory_image = "homedecor_kitchen_faucet_inv.png",
-	description = S("Kitchen Faucet"),
-	groups = {snappy=3},
-	selection_box = kf_cbox,
-	walkable = false,
-	on_rotate = screwdriver.disallow,
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z})
-		if below and
-		  below.name == "homedecor:sink" or
-		  below.name == "homedecor:kitchen_cabinet_with_sink" or
-		  below.name == "homedecor:kitchen_cabinet_with_sink_locked" then
-			local particledef = {
-				outlet      = { x = 0, y = -0.19, z = 0.13 },
-				velocity_x  = { min = -0.05, max = 0.05 },
-				velocity_y  = -0.3,
-				velocity_z  = { min = -0.1,  max = 0 },
-				spread      = 0
-			}
-			homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet")
-		end
-		return itemstack
-	end,
-	on_destruct = homedecor.stop_particle_spawner
-})
-
-homedecor.register("paper_towel", {
-	mesh = "homedecor_paper_towel.obj",
-	tiles = {
-		"homedecor_generic_quilted_paper.png",
-		"default_wood.png"
-	},
-	inventory_image = "homedecor_paper_towel_inv.png",
-	description = S("Paper towels"),
-	groups = { snappy=3 },
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 }
-	},
-})
diff --git a/homedecor/laundry.lua b/homedecor/laundry.lua
deleted file mode 100644
index 5ee9ec6..0000000
--- a/homedecor/laundry.lua
+++ /dev/null
@@ -1,61 +0,0 @@
--- laundry devices
-
-homedecor.register("washing_machine", {
-	description = "Washing Machine",
-	tiles = {
-		"homedecor_washing_machine_top.png",
-		"homedecor_washing_machine_bottom.png",
-		"homedecor_washing_machine_sides.png",
-		"homedecor_washing_machine_sides.png^[transformFX",
-		"homedecor_washing_machine_back.png",
-		"homedecor_washing_machine_front.png"
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, 0.375, 0.375},
-			{-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5},
-		}
-	},
-	selection_box = { type = "regular" },
-	groups = { snappy = 3 },
-})
-
-homedecor.register("dryer", {
-	description = "Tumble dryer",
-	tiles = {
-		"homedecor_dryer_top.png",
-		"homedecor_dryer_bottom.png",
-		"homedecor_dryer_sides.png",
-		"homedecor_dryer_sides.png^[transformFX",
-		"homedecor_dryer_back.png",
-		"homedecor_dryer_front.png"
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, 0.375, 0.375},
-			{-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5},
-		}
-	},
-	selection_box = { type = "regular" },
-	groups = { snappy = 3 },
-})
-
-local ib_cbox = {
-	type = "fixed",
-	fixed = { -6/16, -8/16, -4/16, 17/16, 4/16, 4/16 }
-}
-
-homedecor.register("ironing_board", {
-	description = "Ironing board",
-	mesh = "homedecor_ironing_board.obj",
-	tiles = {
-		"wool_grey.png",
-		{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
-	},
-	expand = {right = "placeholder"},
-	groups = { snappy = 3 },
-	selection_box = ib_cbox,
-	collision_box = ib_cbox
-})
diff --git a/homedecor/listnodes.sh b/homedecor/listnodes.sh
deleted file mode 100644
index 2332080..0000000
--- a/homedecor/listnodes.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-echo "Node listing as of "`date` > nodes.txt
-
-for i in *.lua; do
-	echo -e "\nIn $i:\n" >> nodes.txt
-	cat $i | grep "minetest.register_node(" | \
-	sed "s/minetest.register_node(.homedecor:/homedecor:/; s/., {//" | \
-	sort  >> nodes.txt
-done
-
-less nodes.txt
-rm -f nodes.txt
diff --git a/homedecor/shutters.lua b/homedecor/shutters.lua
deleted file mode 100644
index 0e7b0f2..0000000
--- a/homedecor/shutters.lua
+++ /dev/null
@@ -1,101 +0,0 @@
--- Various kinds of window shutters
-
-local S = homedecor_i18n.gettext
-
-local shutters = {
-	"mahogany",
-	"red",
-	"yellow",
-	"forest_green",
-	"light_blue",
-	"violet",
-	"black",
-	"dark_grey",
-	"grey",
-	"white",
-}
-
-local shutter_cbox = {
-	type = "wallmounted",
-	wall_top =		{ -0.5,  0.4375, -0.5,  0.5,     0.5,    0.5 },
-	wall_bottom =	{ -0.5, -0.5,    -0.5,  0.5,    -0.4375, 0.5 },
-	wall_side =		{ -0.5, -0.5,    -0.5, -0.4375,  0.5,    0.5 }
-}
-
-local inv = "homedecor_window_shutter_inv.png^[colorize:#a87034:150"
-
-homedecor.register("shutter", {
-	mesh = "homedecor_window_shutter.obj",
-	tiles = {
-		{ name = "homedecor_window_shutter.png", color = 0xffa87034 }
-	},
-	description = S("Wooden Shutter"),
-	inventory_image = inv,
-	wield_image = inv,
-	paramtype2 = "colorwallmounted",
-	palette = "unifieddyes_palette_colorwallmounted.png",
-	airbrush_replacement_node = "homedecor:shutter_colored",
-	groups = { snappy = 3, ud_param2_colorable = 1 },
-	sounds = default.node_sound_wood_defaults(),
-	selection_box = shutter_cbox,
-	node_box = shutter_cbox,
-	after_place_node = function(pos, placer, itemstack, pointed_thing)
-		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-	end,
-})
-
-homedecor.register("shutter_colored", {
-	mesh = "homedecor_window_shutter.obj",
-	tiles = { "homedecor_window_shutter.png" },
-	description = S("Wooden Shutter"),
-	inventory_image = "homedecor_window_shutter_inv.png",
-	wield_image = "homedecor_window_shutter_inv.png",
-	paramtype2 = "colorwallmounted",
-	palette = "unifieddyes_palette_colorwallmounted.png",
-	groups = { snappy = 3 , not_in_creative_inventory = 1, ud_param2_colorable = 1},
-	sounds = default.node_sound_wood_defaults(),
-	selection_box = shutter_cbox,
-	node_box = shutter_cbox,
-	after_place_node = function(pos, placer, itemstack, pointed_thing)
-		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
-	end,
-})
-
-minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")
-minetest.register_alias("homedecor:shutter_oak", "homedecor:shutter")
-
--- convert to param2 coloring
-
-homedecor.old_shutter_nodes = {}
-
-for _, color in ipairs(shutters) do
-	table.insert(homedecor.old_shutter_nodes, "homedecor:shutter_"..color)
-end
-
-minetest.register_lbm({
-	name = "homedecor:convert_shutters",
-	label = "Convert shutter static nodes to use param2 color",
-	run_at_every_load = false,
-	nodenames = homedecor.old_shutter_nodes,
-	action = function(pos, node)
-		local name = node.name
-		local color = string.sub(name, string.find(name, "_") + 1)
-
-		if color == "mahogany" then
-			color = "dark_red"
-		elseif color == "forest_green" then
-			color = "dark_green"
-		elseif color == "light_blue" then
-			color = "medium_cyan"
-		elseif color == "red" then
-			color = "medium_red"
-		end
-
-		local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted")
-		local param2 = paletteidx + node.param2
-
-		minetest.set_node(pos, { name = "homedecor:shutter_colored", param2 = param2 })
-		local meta = minetest.get_meta(pos)
-		meta:set_string("dye", "unifieddyes:"..color)
-	end
-})
diff --git a/homedecor/textures/homedecor_clothes_female4.png b/homedecor/textures/homedecor_clothes_female4.png
deleted file mode 100644
index 3e64c5d..0000000
--- a/homedecor/textures/homedecor_clothes_female4.png
+++ /dev/null
diff --git a/homedecor/textures/homedecor_clothes_female4_preview.png b/homedecor/textures/homedecor_clothes_female4_preview.png
deleted file mode 100644
index b8eea30..0000000
--- a/homedecor/textures/homedecor_clothes_female4_preview.png
+++ /dev/null
diff --git a/homedecor/textures/homedecor_clothes_female5.png b/homedecor/textures/homedecor_clothes_female5.png
deleted file mode 100644
index ad634f4..0000000
--- a/homedecor/textures/homedecor_clothes_female5.png
+++ /dev/null
diff --git a/homedecor/textures/homedecor_clothes_female5_preview.png b/homedecor/textures/homedecor_clothes_female5_preview.png
deleted file mode 100644
index f07d654..0000000
--- a/homedecor/textures/homedecor_clothes_female5_preview.png
+++ /dev/null
diff --git a/homedecor/textures/homedecor_coin.png b/homedecor/textures/homedecor_coin.png
deleted file mode 100644
index 84b0932..0000000
--- a/homedecor/textures/homedecor_coin.png
+++ /dev/null
diff --git a/homedecor/textures/homedecor_fan_blades.png b/homedecor/textures/homedecor_fan_blades.png
deleted file mode 100644
index efb9f7c..0000000
--- a/homedecor/textures/homedecor_fan_blades.png
+++ /dev/null
diff --git a/homedecor/textures/homedecor_marble.png b/homedecor/textures/homedecor_marble.png
deleted file mode 100644
index b8b6dd3..0000000
--- a/homedecor/textures/homedecor_marble.png
+++ /dev/null
diff --git a/homedecor_3d_extras/depends.txt b/homedecor_3d_extras/depends.txt
index e6de01a..a3c1901 100644
--- a/homedecor_3d_extras/depends.txt
+++ b/homedecor_3d_extras/depends.txt
@@ -1,3 +1,4 @@
+homedecor_common
 default
-moreblocks?
 vessels?
+moreblocks?
diff --git a/homedecor_bathroom/depends.txt b/homedecor_bathroom/depends.txt
new file mode 100644
index 0000000..8cb6cfd
--- /dev/null
+++ b/homedecor_bathroom/depends.txt
@@ -0,0 +1,5 @@
+homedecor_common
+default
+basic_materials
+unifieddyes
+building_blocks
diff --git a/homedecor/bathroom_sanitation.lua b/homedecor_bathroom/init.lua
index eb4a58d..0811b70 100644
--- a/homedecor/bathroom_sanitation.lua
+++ b/homedecor_bathroom/init.lua
@@ -1,5 +1,119 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
+
+minetest.register_node(":homedecor:bathroom_tiles_dark", {
+	description = S("Bathroom/kitchen tiles (dark)"),
+	tiles = {
+		"homedecor_bathroom_tiles_bg.png"
+	},
+	overlay_tiles = {
+		{ name = "homedecor_bathroom_tiles_fg.png", color = 0xff606060 },
+	},
+	paramtype = "light",
+	paramtype2 = "color",
+	palette = "unifieddyes_palette_extended.png",
+	groups = {cracky=3, ud_param2_colorable = 1},
+	sounds = default.node_sound_stone_defaults(),
+	on_construct = unifieddyes.on_construct,
+})
+
+minetest.register_node(":homedecor:bathroom_tiles_medium", {
+	description = S("Bathroom/kitchen tiles (medium)"),
+	tiles = {
+		"homedecor_bathroom_tiles_bg.png"
+	},
+	overlay_tiles = {
+		{ name = "homedecor_bathroom_tiles_fg.png", color = 0xffc0c0c0 },
+	},
+	paramtype = "light",
+	paramtype2 = "color",
+	palette = "unifieddyes_palette_extended.png",
+	groups = {cracky=3, ud_param2_colorable = 1},
+	sounds = default.node_sound_stone_defaults(),
+	on_construct = unifieddyes.on_construct,
+})
+
+minetest.register_node(":homedecor:bathroom_tiles_light", {
+	description = S("Bathroom/kitchen tiles (light)"),
+	tiles = {
+		"homedecor_bathroom_tiles_bg.png"
+	},
+	overlay_tiles = {
+			{ name = "homedecor_bathroom_tiles_fg.png", color = 0xffffffff },
+	},
+	paramtype = "light",
+	paramtype2 = "color",
+	palette = "unifieddyes_palette_extended.png",
+	groups = {cracky=3, ud_param2_colorable = 1},
+	sounds = default.node_sound_stone_defaults(),
+	on_construct = unifieddyes.on_construct,
+})
+
+local tr_cbox = {
+	type = "fixed",
+	fixed = { -0.375, -0.3125, 0.25, 0.375, 0.375, 0.5 }
+}
+
+homedecor.register("towel_rod", {
+	description = S("Towel rod with towel"),
+	mesh = "homedecor_towel_rod.obj",
+	tiles = {
+		"homedecor_generic_terrycloth.png",
+		"default_wood.png",
+	},
+	inventory_image = "homedecor_towel_rod_inv.png",
+	selection_box = tr_cbox,
+	walkable = false,
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3},
+	sounds = default.node_sound_defaults(),
+})
+
+homedecor.register("medicine_cabinet", {
+	description = S("Medicine cabinet"),
+	mesh = "homedecor_medicine_cabinet.obj",
+	tiles = {
+		'default_wood.png',
+		'homedecor_medicine_cabinet_mirror.png'
+	},
+	inventory_image = "homedecor_medicine_cabinet_inv.png",
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3125, -0.1875, 0.3125, 0.3125, 0.5, 0.5}
+	},
+	walkable = false,
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+	on_punch = function(pos, node, puncher, pointed_thing)
+		node.name = "homedecor:medicine_cabinet_open"
+		minetest.swap_node(pos, node)
+	end,
+	infotext=S("Medicine cabinet"),
+	inventory = {
+		size=6,
+	},
+})
+
+homedecor.register("medicine_cabinet_open", {
+	mesh = "homedecor_medicine_cabinet_open.obj",
+	tiles = {
+		'default_wood.png',
+		'homedecor_medicine_cabinet_mirror.png',
+		'homedecor_medicine_cabinet_inside.png'
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3125, -0.1875, -0.25, 0.3125, 0.5, 0.5}
+	},
+	walkable = false,
+	groups = { snappy = 3, not_in_creative_inventory=1 },
+	drop = "homedecor:medicine_cabinet",
+	on_punch = function(pos, node, puncher, pointed_thing)
+		node.name = "homedecor:medicine_cabinet"
+		minetest.swap_node(pos, node)
+	end,
+})
+
+-- "Sanitation" related
 
 local toilet_sbox = {
 	type = "fixed",
@@ -18,9 +132,9 @@ homedecor.register("toilet", {
 	description = S("Toilet"),
 	mesh = "homedecor_toilet_closed.obj",
 	tiles = {
-		"homedecor_marble.png",
-		"homedecor_marble.png",
-		"homedecor_marble.png",
+		"building_blocks_marble.png",
+		"building_blocks_marble.png",
+		"building_blocks_marble.png",
 		{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey }
 	},
 	selection_box = toilet_sbox,
@@ -36,9 +150,9 @@ homedecor.register("toilet", {
 homedecor.register("toilet_open", {
 	mesh = "homedecor_toilet_open.obj",
 	tiles = {
-		"homedecor_marble.png",
-		"homedecor_marble.png",
-		"homedecor_marble.png",
+		"building_blocks_marble.png",
+		"building_blocks_marble.png",
+		"building_blocks_marble.png",
 		"default_water.png",
 		{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey }
 	},
@@ -101,8 +215,8 @@ homedecor.register("sink", {
 	description = S("Bathroom Sink"),
 	mesh = "homedecor_bathroom_sink.obj",
 	tiles = {
-		"homedecor_marble.png",
-		"homedecor_marble.png",
+		"building_blocks_marble.png",
+		"building_blocks_marble.png",
 		"default_water.png"
 	},
 	inventory_image="homedecor_bathroom_sink_inv.png",
@@ -189,7 +303,7 @@ homedecor.register("shower_tray", {
 	description = S("Shower Tray"),
 	tiles = {
 		"forniture_marble_base_ducha_top.png",
-		"homedecor_marble.png"
+		"building_blocks_marble.png"
 	},
 	node_box = {
 		type = "fixed",
@@ -258,7 +372,7 @@ homedecor.register("bathtub_clawfoot_brass_taps", {
 		"homedecor_generic_metal_bright.png",
 		"homedecor_generic_metal_bright.png",
 		"homedecor_generic_metal_brass.png",
-		"homedecor_marble.png",
+		"building_blocks_marble.png",
 		"homedecor_bathtub_clawfoot_bottom_inside.png",
 	},
 	description = S("Bathtub, clawfoot, with brass taps"),
@@ -278,7 +392,7 @@ homedecor.register("bathtub_clawfoot_chrome_taps", {
 		"homedecor_generic_metal_bright.png",
 		"homedecor_generic_metal_bright.png",
 		"homedecor_generic_metal_bright.png",
-		"homedecor_marble.png",
+		"building_blocks_marble.png",
 		"homedecor_bathtub_clawfoot_bottom_inside.png",
 	},
 	description = S("Bathtub, clawfoot, with chrome taps"),
@@ -313,6 +427,8 @@ homedecor.register("bathroom_set", {
 	sounds = default.node_sound_glass_defaults(),
 })
 
+-- aliases
+
 minetest.register_alias("3dforniture:toilet", "homedecor:toilet")
 minetest.register_alias("3dforniture:toilet_open", "homedecor:toilet_open")
 minetest.register_alias("3dforniture:sink", "homedecor:sink")
@@ -327,3 +443,153 @@ minetest.register_alias("taps", "homedecor:taps")
 minetest.register_alias("shower_tray", "homedecor:shower_tray")
 minetest.register_alias("shower_head", "homedecor:shower_head")
 minetest.register_alias("table_lamp", "homedecor:table_lamp_off")
+
+-- convert old static nodes
+
+homedecor.old_static_bathroom_tiles = {
+	"homedecor:tiles_1",
+	"homedecor:tiles_2",
+	"homedecor:tiles_3",
+	"homedecor:tiles_4",
+	"homedecor:tiles_red",
+	"homedecor:tiles_tan",
+	"homedecor:tiles_yellow",
+	"homedecor:tiles_green",
+	"homedecor:tiles_blue"
+}
+
+local old_to_color = {
+	"light_grey",
+	"grey",
+	"black",
+	"black"
+}
+
+minetest.register_lbm({
+	name = ":homedecor:convert_bathroom_tiles",
+	label = "Convert bathroom tiles to use param2 color",
+	run_at_every_load = false,
+	nodenames = homedecor.old_static_bathroom_tiles,
+	action = function(pos, node)
+		local name = node.name
+		local newname = "homedecor:bathroom_tiles_light"
+		local a = string.find(name, "_")
+		local color = string.sub(name, a + 1)
+
+		if color == "tan" then
+			color = "yellow_s50"
+		elseif color == "1" or color == "2" or color == "3" or color == "4" then
+			if color == "4" then
+				newname = "homedecor:bathroom_tiles_medium"
+			end
+			color = old_to_color[tonumber(color)]
+		elseif color ~= "yellow" then
+			color = color.."_s50"
+		end
+
+		local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "extended")
+
+		minetest.set_node(pos, { name = newname, param2 = paletteidx })
+		local meta = minetest.get_meta(pos)
+		meta:set_string("dye", "unifieddyes:"..color)
+		meta:set_string("palette", "ext")
+	end
+})
+
+-- crafting
+
+
+minetest.register_craft({
+    output = "homedecor:towel_rod",
+    recipe = {
+		{ "group:wood", "group:stick", "group:wood" },
+		{ "", "building_blocks:terrycloth_towel", "" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:toilet_paper",
+    recipe = {
+		{ "", "default:paper", "default:paper" },
+		{ "group:wood", "group:stick", "default:paper" },
+		{ "", "default:paper", "default:paper" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:medicine_cabinet",
+    recipe = {
+		{ "group:stick", "default:glass", "group:stick" },
+		{ "group:stick", "default:glass", "group:stick" },
+		{ "group:stick", "default:glass", "group:stick" }
+    },
+})
+
+
+-- bathroom/kitchen tiles
+
+minetest.register_craft( {
+		output = "homedecor:bathroom_tiles_light 4",
+		recipe = {
+			{ "group:marble", "group:marble", "" },
+			{ "group:marble", "group:marble", "dye:white" }
+		},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:bathroom_tiles_light",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:bathroom_tiles_light",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft( {
+		output = "homedecor:bathroom_tiles_medium 4",
+		recipe = {
+			{ "group:marble", "group:marble", "" },
+			{ "group:marble", "group:marble", "dye:grey" }
+		},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:bathroom_tiles_medium",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:bathroom_tiles_medium",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft( {
+		output = "homedecor:bathroom_tiles_dark 4",
+		recipe = {
+			{ "group:marble", "group:marble", "" },
+			{ "group:marble", "group:marble", "dye:dark_grey" }
+		},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:bathroom_tiles_dark",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:bathroom_tiles_dark",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:bathroom_set",
+	recipe = {
+		{ "", "homedecor:glass_table_small_round", "" },
+		{ "basic_materials:plastic_sheet", "homedecor:glass_table_small_round", "basic_materials:plastic_sheet" },
+		{ "group:stick", "basic_materials:plastic_sheet", "group:stick" }
+	},
+})
diff --git a/homedecor/models/homedecor_bathroom_faucet.obj b/homedecor_bathroom/models/homedecor_bathroom_faucet.obj
index b987fd8..b987fd8 100644
--- a/homedecor/models/homedecor_bathroom_faucet.obj
+++ b/homedecor_bathroom/models/homedecor_bathroom_faucet.obj
diff --git a/homedecor/models/homedecor_bathroom_set.obj b/homedecor_bathroom/models/homedecor_bathroom_set.obj
index 5ee2ab0..5ee2ab0 100644
--- a/homedecor/models/homedecor_bathroom_set.obj
+++ b/homedecor_bathroom/models/homedecor_bathroom_set.obj
diff --git a/homedecor/models/homedecor_bathroom_sink.obj b/homedecor_bathroom/models/homedecor_bathroom_sink.obj
index 6b1fc85..6b1fc85 100644
--- a/homedecor/models/homedecor_bathroom_sink.obj
+++ b/homedecor_bathroom/models/homedecor_bathroom_sink.obj
diff --git a/homedecor/models/homedecor_bathtub_clawfoot.obj b/homedecor_bathroom/models/homedecor_bathtub_clawfoot.obj
index 7147fc1..7147fc1 100644
--- a/homedecor/models/homedecor_bathtub_clawfoot.obj
+++ b/homedecor_bathroom/models/homedecor_bathtub_clawfoot.obj
diff --git a/homedecor/models/homedecor_medicine_cabinet.obj b/homedecor_bathroom/models/homedecor_medicine_cabinet.obj
index 5dc068d..5dc068d 100644
--- a/homedecor/models/homedecor_medicine_cabinet.obj
+++ b/homedecor_bathroom/models/homedecor_medicine_cabinet.obj
diff --git a/homedecor/models/homedecor_medicine_cabinet_open.obj b/homedecor_bathroom/models/homedecor_medicine_cabinet_open.obj
index 5a0d026..5a0d026 100644
--- a/homedecor/models/homedecor_medicine_cabinet_open.obj
+++ b/homedecor_bathroom/models/homedecor_medicine_cabinet_open.obj
diff --git a/homedecor/models/homedecor_shower_head.obj b/homedecor_bathroom/models/homedecor_shower_head.obj
index 9e4aa56..9e4aa56 100644
--- a/homedecor/models/homedecor_shower_head.obj
+++ b/homedecor_bathroom/models/homedecor_shower_head.obj
diff --git a/homedecor/models/homedecor_toilet_closed.obj b/homedecor_bathroom/models/homedecor_toilet_closed.obj
index 49f610b..49f610b 100644
--- a/homedecor/models/homedecor_toilet_closed.obj
+++ b/homedecor_bathroom/models/homedecor_toilet_closed.obj
diff --git a/homedecor/models/homedecor_toilet_open.obj b/homedecor_bathroom/models/homedecor_toilet_open.obj
index 6fad0f9..6fad0f9 100644
--- a/homedecor/models/homedecor_toilet_open.obj
+++ b/homedecor_bathroom/models/homedecor_toilet_open.obj
diff --git a/homedecor/models/homedecor_toilet_paper.obj b/homedecor_bathroom/models/homedecor_toilet_paper.obj
index 38589bf..38589bf 100644
--- a/homedecor/models/homedecor_toilet_paper.obj
+++ b/homedecor_bathroom/models/homedecor_toilet_paper.obj
diff --git a/homedecor/models/homedecor_towel_rod.obj b/homedecor_bathroom/models/homedecor_towel_rod.obj
index 26c63de..26c63de 100644
--- a/homedecor/models/homedecor_towel_rod.obj
+++ b/homedecor_bathroom/models/homedecor_towel_rod.obj
diff --git a/homedecor/textures/3dforniture_taps_brass_inv.png b/homedecor_bathroom/textures/3dforniture_taps_brass_inv.png
index 16801db..16801db 100644
--- a/homedecor/textures/3dforniture_taps_brass_inv.png
+++ b/homedecor_bathroom/textures/3dforniture_taps_brass_inv.png
diff --git a/homedecor/textures/3dforniture_taps_inv.png b/homedecor_bathroom/textures/3dforniture_taps_inv.png
index e177b53..e177b53 100644
--- a/homedecor/textures/3dforniture_taps_inv.png
+++ b/homedecor_bathroom/textures/3dforniture_taps_inv.png
diff --git a/homedecor/textures/forniture_marble_base_ducha_top.png b/homedecor_bathroom/textures/forniture_marble_base_ducha_top.png
index 5a24c79..5a24c79 100644
--- a/homedecor/textures/forniture_marble_base_ducha_top.png
+++ b/homedecor_bathroom/textures/forniture_marble_base_ducha_top.png
diff --git a/homedecor/textures/homedecor_bathroom_set_cup.png b/homedecor_bathroom/textures/homedecor_bathroom_set_cup.png
index d6897ba..d6897ba 100644
--- a/homedecor/textures/homedecor_bathroom_set_cup.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_set_cup.png
diff --git a/homedecor/textures/homedecor_bathroom_set_inv.png b/homedecor_bathroom/textures/homedecor_bathroom_set_inv.png
index fb5944a..fb5944a 100644
--- a/homedecor/textures/homedecor_bathroom_set_inv.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_set_inv.png
diff --git a/homedecor/textures/homedecor_bathroom_set_mirror.png b/homedecor_bathroom/textures/homedecor_bathroom_set_mirror.png
index c5cb6b6..c5cb6b6 100644
--- a/homedecor/textures/homedecor_bathroom_set_mirror.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_set_mirror.png
diff --git a/homedecor/textures/homedecor_bathroom_set_toothbrush.png b/homedecor_bathroom/textures/homedecor_bathroom_set_toothbrush.png
index d857abe..d857abe 100644
--- a/homedecor/textures/homedecor_bathroom_set_toothbrush.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_set_toothbrush.png
diff --git a/homedecor/textures/homedecor_bathroom_set_toothpaste.png b/homedecor_bathroom/textures/homedecor_bathroom_set_toothpaste.png
index 32fdfca..32fdfca 100644
--- a/homedecor/textures/homedecor_bathroom_set_toothpaste.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_set_toothpaste.png
diff --git a/homedecor/textures/homedecor_bathroom_set_tray.png b/homedecor_bathroom/textures/homedecor_bathroom_set_tray.png
index 45ecb59..45ecb59 100644
--- a/homedecor/textures/homedecor_bathroom_set_tray.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_set_tray.png
diff --git a/homedecor/textures/homedecor_bathroom_sink_inv.png b/homedecor_bathroom/textures/homedecor_bathroom_sink_inv.png
index 44918f3..44918f3 100644
--- a/homedecor/textures/homedecor_bathroom_sink_inv.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_sink_inv.png
diff --git a/homedecor/textures/homedecor_bathroom_tiles_bg.png b/homedecor_bathroom/textures/homedecor_bathroom_tiles_bg.png
index 4fa963e..4fa963e 100644
--- a/homedecor/textures/homedecor_bathroom_tiles_bg.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_tiles_bg.png
diff --git a/homedecor/textures/homedecor_bathroom_tiles_fg.png b/homedecor_bathroom/textures/homedecor_bathroom_tiles_fg.png
index bf19c5b..bf19c5b 100644
--- a/homedecor/textures/homedecor_bathroom_tiles_fg.png
+++ b/homedecor_bathroom/textures/homedecor_bathroom_tiles_fg.png
diff --git a/homedecor/textures/homedecor_bathtub_clawfoot_bottom_inside.png b/homedecor_bathroom/textures/homedecor_bathtub_clawfoot_bottom_inside.png
index 2bf1f4b..2bf1f4b 100644
--- a/homedecor/textures/homedecor_bathtub_clawfoot_bottom_inside.png
+++ b/homedecor_bathroom/textures/homedecor_bathtub_clawfoot_bottom_inside.png
diff --git a/homedecor/textures/homedecor_medicine_cabinet_inside.png b/homedecor_bathroom/textures/homedecor_medicine_cabinet_inside.png
index c5cb3e0..c5cb3e0 100644
--- a/homedecor/textures/homedecor_medicine_cabinet_inside.png
+++ b/homedecor_bathroom/textures/homedecor_medicine_cabinet_inside.png
diff --git a/homedecor/textures/homedecor_medicine_cabinet_inv.png b/homedecor_bathroom/textures/homedecor_medicine_cabinet_inv.png
index d3664bd..d3664bd 100644
--- a/homedecor/textures/homedecor_medicine_cabinet_inv.png
+++ b/homedecor_bathroom/textures/homedecor_medicine_cabinet_inv.png
diff --git a/homedecor/textures/homedecor_medicine_cabinet_mirror.png b/homedecor_bathroom/textures/homedecor_medicine_cabinet_mirror.png
index 9bc2dfb..9bc2dfb 100644
--- a/homedecor/textures/homedecor_medicine_cabinet_mirror.png
+++ b/homedecor_bathroom/textures/homedecor_medicine_cabinet_mirror.png
diff --git a/homedecor/textures/homedecor_shower_head.png b/homedecor_bathroom/textures/homedecor_shower_head.png
index 750d9db..750d9db 100644
--- a/homedecor/textures/homedecor_shower_head.png
+++ b/homedecor_bathroom/textures/homedecor_shower_head.png
diff --git a/homedecor/textures/homedecor_shower_head_inv.png b/homedecor_bathroom/textures/homedecor_shower_head_inv.png
index 46d1cf8..46d1cf8 100644
--- a/homedecor/textures/homedecor_shower_head_inv.png
+++ b/homedecor_bathroom/textures/homedecor_shower_head_inv.png
diff --git a/homedecor/textures/homedecor_toilet_paper_inv.png b/homedecor_bathroom/textures/homedecor_toilet_paper_inv.png
index d5d1835..d5d1835 100644
--- a/homedecor/textures/homedecor_toilet_paper_inv.png
+++ b/homedecor_bathroom/textures/homedecor_toilet_paper_inv.png
diff --git a/homedecor/textures/homedecor_towel_rod_inv.png b/homedecor_bathroom/textures/homedecor_towel_rod_inv.png
index 11b22ca..11b22ca 100644
--- a/homedecor/textures/homedecor_towel_rod_inv.png
+++ b/homedecor_bathroom/textures/homedecor_towel_rod_inv.png
diff --git a/homedecor_bedroom/depends.txt b/homedecor_bedroom/depends.txt
new file mode 100644
index 0000000..f2e42cf
--- /dev/null
+++ b/homedecor_bedroom/depends.txt
@@ -0,0 +1,5 @@
+homedecor_common
+default
+basic_materials
+unifieddyes
+creative
diff --git a/homedecor/bedroom.lua b/homedecor_bedroom/init.lua
index 7059809..fc3f733 100644
--- a/homedecor/bedroom.lua
+++ b/homedecor_bedroom/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local function N_(x) return x end
 
@@ -220,7 +220,7 @@ for _, color in ipairs(bedcolors) do
 end
 
 minetest.register_lbm({
-	name = "homedecor:convert_beds",
+	name = ":homedecor:convert_beds",
 	label = "Convert homedecor static bed nodes to use param2 color",
 	run_at_every_load = false,
 	nodenames = homedecor.old_bed_nodes,
@@ -265,3 +265,126 @@ minetest.register_lbm({
 		meta:set_string("dye", "unifieddyes:"..color)
 	end
 })
+
+-- crafting
+
+
+minetest.register_craft( {
+        output = "homedecor:nightstand_oak_one_drawer",
+        recipe = {
+                { "homedecor:drawer_small" },
+                { "group:wood" },
+        },
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:nightstand_oak_one_drawer",
+        burntime = 30,
+})
+
+minetest.register_craft( {
+        output = "homedecor:nightstand_oak_two_drawers",
+        recipe = {
+                { "homedecor:drawer_small" },
+                { "homedecor:drawer_small" },
+                { "group:wood" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:nightstand_oak_two_drawers",
+        recipe = {
+                { "homedecor:nightstand_oak_one_drawer" },
+                { "homedecor:drawer_small" },
+        },
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:nightstand_oak_two_drawers",
+        burntime = 30,
+})
+
+--
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:nightstand_mahogany_one_drawer",
+        recipe = {
+                "homedecor:nightstand_oak_one_drawer",
+                "dye:brown",
+        },
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:nightstand_mahogany_one_drawer",
+        burntime = 30,
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:nightstand_mahogany_two_drawers",
+        recipe = {
+                "homedecor:nightstand_oak_two_drawers",
+                "dye:brown",
+        },
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:nightstand_mahogany_two_drawers",
+        burntime = 30,
+})
+
+
+minetest.register_craft( {
+	output = "homedecor:bed_regular",
+	recipe = {
+		{ "group:stick", "", "group:stick" },
+		{ "wool:white", "wool:white", "wool:white" },
+		{ "group:wood", "", "group:wood" },
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:bed_regular",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:bed_regular",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft( {
+	output = "homedecor:bed_kingsize",
+	recipe = {
+		{ "homedecor:bed_regular", "homedecor:bed_regular" }
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:bed_kingsize",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:bed_kingsize",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:bed_kingsize",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:bed_regular",
+	recipe = {
+		"NEUTRAL_NODE",
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
diff --git a/homedecor/models/homedecor_bed_extended.obj b/homedecor_bedroom/models/homedecor_bed_extended.obj
index b8e49c4..b8e49c4 100644
--- a/homedecor/models/homedecor_bed_extended.obj
+++ b/homedecor_bedroom/models/homedecor_bed_extended.obj
diff --git a/homedecor/models/homedecor_bed_kingsize.obj b/homedecor_bedroom/models/homedecor_bed_kingsize.obj
index 89a939d..89a939d 100644
--- a/homedecor/models/homedecor_bed_kingsize.obj
+++ b/homedecor_bedroom/models/homedecor_bed_kingsize.obj
diff --git a/homedecor/models/homedecor_bed_regular.obj b/homedecor_bedroom/models/homedecor_bed_regular.obj
index cecbd96..cecbd96 100644
--- a/homedecor/models/homedecor_bed_regular.obj
+++ b/homedecor_bedroom/models/homedecor_bed_regular.obj
diff --git a/homedecor/textures/homedecor_bed_bottom.png b/homedecor_bedroom/textures/homedecor_bed_bottom.png
index 3451655..3451655 100644
--- a/homedecor/textures/homedecor_bed_bottom.png
+++ b/homedecor_bedroom/textures/homedecor_bed_bottom.png
diff --git a/homedecor/textures/homedecor_bed_frame.png b/homedecor_bedroom/textures/homedecor_bed_frame.png
index b334e40..b334e40 100644
--- a/homedecor/textures/homedecor_bed_frame.png
+++ b/homedecor_bedroom/textures/homedecor_bed_frame.png
diff --git a/homedecor/textures/homedecor_bed_inv.png b/homedecor_bedroom/textures/homedecor_bed_inv.png
index c89575c..c89575c 100644
--- a/homedecor/textures/homedecor_bed_inv.png
+++ b/homedecor_bedroom/textures/homedecor_bed_inv.png
diff --git a/homedecor/textures/homedecor_bed_kingsize_inv.png b/homedecor_bedroom/textures/homedecor_bed_kingsize_inv.png
index c454e77..c454e77 100644
--- a/homedecor/textures/homedecor_bed_kingsize_inv.png
+++ b/homedecor_bedroom/textures/homedecor_bed_kingsize_inv.png
diff --git a/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_1_drawer_front.png
index a746efa..a746efa 100644
--- a/homedecor/textures/homedecor_nightstand_mahogany_1_drawer_front.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_1_drawer_front.png
diff --git a/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_2_drawer_front.png
index 17b016a..17b016a 100644
--- a/homedecor/textures/homedecor_nightstand_mahogany_2_drawer_front.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_2_drawer_front.png
diff --git a/homedecor/textures/homedecor_nightstand_mahogany_back.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_back.png
index 45a9b7a..45a9b7a 100644
--- a/homedecor/textures/homedecor_nightstand_mahogany_back.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_back.png
diff --git a/homedecor/textures/homedecor_nightstand_mahogany_lr.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_lr.png
index aae8c58..aae8c58 100644
--- a/homedecor/textures/homedecor_nightstand_mahogany_lr.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_lr.png
diff --git a/homedecor/textures/homedecor_nightstand_mahogany_tb.png b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_tb.png
index 553a17e..553a17e 100644
--- a/homedecor/textures/homedecor_nightstand_mahogany_tb.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_mahogany_tb.png
diff --git a/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_1_drawer_front.png
index 30fcd1e..30fcd1e 100644
--- a/homedecor/textures/homedecor_nightstand_oak_1_drawer_front.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_oak_1_drawer_front.png
diff --git a/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_2_drawer_front.png
index 07f4c45..07f4c45 100644
--- a/homedecor/textures/homedecor_nightstand_oak_2_drawer_front.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_oak_2_drawer_front.png
diff --git a/homedecor/textures/homedecor_nightstand_oak_back.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_back.png
index d1ba23f..d1ba23f 100644
--- a/homedecor/textures/homedecor_nightstand_oak_back.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_oak_back.png
diff --git a/homedecor/textures/homedecor_nightstand_oak_lr.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_lr.png
index 12f1555..12f1555 100644
--- a/homedecor/textures/homedecor_nightstand_oak_lr.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_oak_lr.png
diff --git a/homedecor/textures/homedecor_nightstand_oak_tb.png b/homedecor_bedroom/textures/homedecor_nightstand_oak_tb.png
index f61e63e..f61e63e 100644
--- a/homedecor/textures/homedecor_nightstand_oak_tb.png
+++ b/homedecor_bedroom/textures/homedecor_nightstand_oak_tb.png
diff --git a/homedecor_books/depends.txt b/homedecor_books/depends.txt
new file mode 100644
index 0000000..ddb63ed
--- /dev/null
+++ b/homedecor_books/depends.txt
@@ -0,0 +1,5 @@
+homedecor_common
+default
+unifieddyes
+creative
+
diff --git a/homedecor/books.lua b/homedecor_books/init.lua
index 20b1e39..3bdce05 100644
--- a/homedecor/books.lua
+++ b/homedecor_books/init.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local function N_(x) return x end
 
@@ -183,5 +183,30 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
 	return true
 end)
 
+-- crafting
+
+
+local bookcolors = {
+	"red",
+	"green",
+	"blue",
+	"violet",
+	"grey",
+	"brown"
+}
+
+for _, color in ipairs(bookcolors) do
+	minetest.register_craft({
+		type = "shapeless",
+		output = "homedecor:book_"..color,
+		recipe = {
+			"dye:"..color,
+			"default:book"
+		},
+	})
+end
+
+-- aliases
+
 minetest.register_alias("homedecor:book", "homedecor:book_grey")
 minetest.register_alias("homedecor:book_open", "homedecor:book_open_grey")
diff --git a/homedecor/models/homedecor_book.obj b/homedecor_books/models/homedecor_book.obj
index 5c40342..5c40342 100644
--- a/homedecor/models/homedecor_book.obj
+++ b/homedecor_books/models/homedecor_book.obj
diff --git a/homedecor/models/homedecor_book_open.obj b/homedecor_books/models/homedecor_book_open.obj
index 3e81ef2..3e81ef2 100644
--- a/homedecor/models/homedecor_book_open.obj
+++ b/homedecor_books/models/homedecor_book_open.obj
diff --git a/homedecor/textures/homedecor_book_cover.png b/homedecor_books/textures/homedecor_book_cover.png
index 2fb8514..2fb8514 100644
--- a/homedecor/textures/homedecor_book_cover.png
+++ b/homedecor_books/textures/homedecor_book_cover.png
diff --git a/homedecor/textures/homedecor_book_cover_trim.png b/homedecor_books/textures/homedecor_book_cover_trim.png
index 5425385..5425385 100644
--- a/homedecor/textures/homedecor_book_cover_trim.png
+++ b/homedecor_books/textures/homedecor_book_cover_trim.png
diff --git a/homedecor/textures/homedecor_book_edges.png b/homedecor_books/textures/homedecor_book_edges.png
index 5b48944..5b48944 100644
--- a/homedecor/textures/homedecor_book_edges.png
+++ b/homedecor_books/textures/homedecor_book_edges.png
diff --git a/homedecor/textures/homedecor_book_inv.png b/homedecor_books/textures/homedecor_book_inv.png
index b8dd243..b8dd243 100644
--- a/homedecor/textures/homedecor_book_inv.png
+++ b/homedecor_books/textures/homedecor_book_inv.png
diff --git a/homedecor/textures/homedecor_book_pages.png b/homedecor_books/textures/homedecor_book_pages.png
index d4bad77..d4bad77 100644
--- a/homedecor/textures/homedecor_book_pages.png
+++ b/homedecor_books/textures/homedecor_book_pages.png
diff --git a/homedecor/textures/homedecor_book_trim_inv.png b/homedecor_books/textures/homedecor_book_trim_inv.png
index 7096703..7096703 100644
--- a/homedecor/textures/homedecor_book_trim_inv.png
+++ b/homedecor_books/textures/homedecor_book_trim_inv.png
diff --git a/homedecor_climate_control/depends.txt b/homedecor_climate_control/depends.txt
new file mode 100644
index 0000000..f37b655
--- /dev/null
+++ b/homedecor_climate_control/depends.txt
@@ -0,0 +1,4 @@
+homedecor_common
+default
+basic_materials
+building_blocks?
diff --git a/homedecor/climate-control.lua b/homedecor_climate_control/init.lua
index 412fedf..5524f26 100644
--- a/homedecor/climate-control.lua
+++ b/homedecor_climate_control/init.lua
@@ -1,6 +1,6 @@
 -- Nodes that would affect the local temperature e.g. fans, heater, A/C
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 homedecor.register("air_conditioner", {
 	description = S("Air Conditioner"),
@@ -16,7 +16,7 @@ homedecor.register("air_conditioner", {
 
 -- fans
 
-minetest.register_entity("homedecor:mesh_desk_fan", {
+minetest.register_entity(":homedecor:mesh_desk_fan", {
 	collisionbox = homedecor.nodebox.null,
 	visual = "mesh",
 	mesh = "homedecor_desk_fan.b3d",
@@ -141,3 +141,69 @@ homedecor.register("radiator", {
 	collision_box = r_cbox,
 	sounds = default.node_sound_wood_defaults(),
 })
+
+-- crafting
+
+
+minetest.register_craft({
+    output = "homedecor:air_conditioner",
+    recipe = {
+		{ "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" },
+		{ "default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor" },
+		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:air_conditioner",
+    recipe = {
+		{ "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" },
+		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" },
+		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:ceiling_fan",
+    recipe = {
+		{ "basic_materials:motor" },
+		{ "homedecor:fan_blades" },
+		{ "homedecor:glowlight_small_cube" }
+	}
+})
+
+minetest.register_craft({
+    output = "homedecor:ceiling_fan",
+    recipe = {
+		{ "basic_materials:motor" },
+		{ "homedecor:fan_blades" },
+		{ "homedecor:glowlight_small_cube" }
+	}
+})
+
+
+minetest.register_craft( {
+        output = "homedecor:desk_fan",
+        recipe = {
+			{"default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor"},
+			{"", "default:steel_ingot", ""}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:space_heater",
+        recipe = {
+			{"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"},
+			{"basic_materials:plastic_sheet", "homedecor:fan_blades", "basic_materials:motor"},
+			{"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:radiator",
+        recipe = {
+			{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" },
+			{ "basic_materials:ic", "basic_materials:heating_element", "" },
+			{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }
+        },
+})
diff --git a/homedecor/models/homedecor_ac.obj b/homedecor_climate_control/models/homedecor_ac.obj
index 959aa91..959aa91 100644
--- a/homedecor/models/homedecor_ac.obj
+++ b/homedecor_climate_control/models/homedecor_ac.obj
diff --git a/homedecor/models/homedecor_desk_fan.b3d b/homedecor_climate_control/models/homedecor_desk_fan.b3d
index d49e8b1..d49e8b1 100644
--- a/homedecor/models/homedecor_desk_fan.b3d
+++ b/homedecor_climate_control/models/homedecor_desk_fan.b3d
diff --git a/homedecor/models/homedecor_radiator.obj b/homedecor_climate_control/models/homedecor_radiator.obj
index 287f862..287f862 100644
--- a/homedecor/models/homedecor_radiator.obj
+++ b/homedecor_climate_control/models/homedecor_radiator.obj
diff --git a/homedecor/textures/homedecor_ac.png b/homedecor_climate_control/textures/homedecor_ac.png
index 3c5b80d..3c5b80d 100644
--- a/homedecor/textures/homedecor_ac.png
+++ b/homedecor_climate_control/textures/homedecor_ac.png
diff --git a/homedecor/textures/homedecor_ceiling_fan_bottom.png b/homedecor_climate_control/textures/homedecor_ceiling_fan_bottom.png
index 04a333b..04a333b 100644
--- a/homedecor/textures/homedecor_ceiling_fan_bottom.png
+++ b/homedecor_climate_control/textures/homedecor_ceiling_fan_bottom.png
diff --git a/homedecor/textures/homedecor_ceiling_fan_inv.png b/homedecor_climate_control/textures/homedecor_ceiling_fan_inv.png
index f887b38..f887b38 100644
--- a/homedecor/textures/homedecor_ceiling_fan_inv.png
+++ b/homedecor_climate_control/textures/homedecor_ceiling_fan_inv.png
diff --git a/homedecor/textures/homedecor_ceiling_fan_sides.png b/homedecor_climate_control/textures/homedecor_ceiling_fan_sides.png
index 82bae2f..82bae2f 100644
--- a/homedecor/textures/homedecor_ceiling_fan_sides.png
+++ b/homedecor_climate_control/textures/homedecor_ceiling_fan_sides.png
diff --git a/homedecor/textures/homedecor_ceiling_fan_top.png b/homedecor_climate_control/textures/homedecor_ceiling_fan_top.png
index 1362609..1362609 100644
--- a/homedecor/textures/homedecor_ceiling_fan_top.png
+++ b/homedecor_climate_control/textures/homedecor_ceiling_fan_top.png
diff --git a/homedecor/textures/homedecor_desk_fan_body.png b/homedecor_climate_control/textures/homedecor_desk_fan_body.png
index 7e35364..7e35364 100644
--- a/homedecor/textures/homedecor_desk_fan_body.png
+++ b/homedecor_climate_control/textures/homedecor_desk_fan_body.png
diff --git a/homedecor/textures/homedecor_desk_fan_inv.png b/homedecor_climate_control/textures/homedecor_desk_fan_inv.png
index 3b91997..3b91997 100644
--- a/homedecor/textures/homedecor_desk_fan_inv.png
+++ b/homedecor_climate_control/textures/homedecor_desk_fan_inv.png
diff --git a/homedecor/models/homedecor_desk_fan_uv.png b/homedecor_climate_control/textures/homedecor_desk_fan_uv.png
index 0ca6cad..0ca6cad 100644
--- a/homedecor/models/homedecor_desk_fan_uv.png
+++ b/homedecor_climate_control/textures/homedecor_desk_fan_uv.png
diff --git a/homedecor/textures/homedecor_heater_back.png b/homedecor_climate_control/textures/homedecor_heater_back.png
index ea846b9..ea846b9 100644
--- a/homedecor/textures/homedecor_heater_back.png
+++ b/homedecor_climate_control/textures/homedecor_heater_back.png
diff --git a/homedecor/textures/homedecor_heater_front.png b/homedecor_climate_control/textures/homedecor_heater_front.png
index 8ea9400..8ea9400 100644
--- a/homedecor/textures/homedecor_heater_front.png
+++ b/homedecor_climate_control/textures/homedecor_heater_front.png
diff --git a/homedecor/textures/homedecor_heater_inv.png b/homedecor_climate_control/textures/homedecor_heater_inv.png
index d10ade7..d10ade7 100644
--- a/homedecor/textures/homedecor_heater_inv.png
+++ b/homedecor_climate_control/textures/homedecor_heater_inv.png
diff --git a/homedecor/textures/homedecor_heater_sides.png b/homedecor_climate_control/textures/homedecor_heater_sides.png
index 2e4f0fa..2e4f0fa 100644
--- a/homedecor/textures/homedecor_heater_sides.png
+++ b/homedecor_climate_control/textures/homedecor_heater_sides.png
diff --git a/homedecor/textures/homedecor_heater_tb.png b/homedecor_climate_control/textures/homedecor_heater_tb.png
index dcfa522..dcfa522 100644
--- a/homedecor/textures/homedecor_heater_tb.png
+++ b/homedecor_climate_control/textures/homedecor_heater_tb.png
diff --git a/homedecor/textures/homedecor_radiator_controls.png b/homedecor_climate_control/textures/homedecor_radiator_controls.png
index 28d088b..28d088b 100644
--- a/homedecor/textures/homedecor_radiator_controls.png
+++ b/homedecor_climate_control/textures/homedecor_radiator_controls.png
diff --git a/homedecor/textures/homedecor_radiator_inv.png b/homedecor_climate_control/textures/homedecor_radiator_inv.png
index 3059f0a..3059f0a 100644
--- a/homedecor/textures/homedecor_radiator_inv.png
+++ b/homedecor_climate_control/textures/homedecor_radiator_inv.png
diff --git a/homedecor_clocks/depends.txt b/homedecor_clocks/depends.txt
new file mode 100644
index 0000000..ff3cb2b
--- /dev/null
+++ b/homedecor_clocks/depends.txt
@@ -0,0 +1,5 @@
+homedecor_common
+default
+basic_materials
+dye
+building_blocks?
diff --git a/homedecor/clocks.lua b/homedecor_clocks/init.lua
index 71d7ecd..4251060 100644
--- a/homedecor/clocks.lua
+++ b/homedecor_clocks/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local clock_sbox = {
 	type = "fixed",
@@ -97,5 +97,55 @@ homedecor.register("grandfather_clock", {
 	on_rotate = screwdriver.rotate_simple
 })
 
+-- crafting
+
+
+minetest.register_craft({
+    output = "homedecor:analog_clock_plastic 2",
+    recipe = {
+		{ "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:analog_clock_wood 2",
+    recipe = {
+		{ "group:stick", "dye:black", "group:stick" },
+		{ "group:stick", "basic_materials:ic", "group:stick" },
+		{ "group:stick", "dye:black", "group:stick" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:digital_clock 2",
+    recipe = {
+		{ "basic_materials:plastic_sheet", "default:paper", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:alarm_clock",
+    recipe = {
+		{ "basic_materials:plastic_sheet", "homedecor:speaker_driver", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "homedecor:digital_clock", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" },
+    },
+})
+
+minetest.register_craft({
+	output = "homedecor:grandfather_clock",
+	recipe = {
+		{ "building_blocks:slab_hardwood","homedecor:analog_clock_wood","building_blocks:slab_hardwood" },
+		{ "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" },
+		{ "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" }
+	},
+})
+
+-- aliases
+
 minetest.register_alias("homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock")
 minetest.register_alias("homedecor:grandfather_clock_top", "air")
diff --git a/homedecor/models/homedecor_analog_clock.obj b/homedecor_clocks/models/homedecor_analog_clock.obj
index e1ed1b2..e1ed1b2 100644
--- a/homedecor/models/homedecor_analog_clock.obj
+++ b/homedecor_clocks/models/homedecor_analog_clock.obj
diff --git a/homedecor/models/homedecor_grandfather_clock.obj b/homedecor_clocks/models/homedecor_grandfather_clock.obj
index a7c86fe..a7c86fe 100644
--- a/homedecor/models/homedecor_grandfather_clock.obj
+++ b/homedecor_clocks/models/homedecor_grandfather_clock.obj
diff --git a/homedecor/textures/homedecor_alarm_clock_back.png b/homedecor_clocks/textures/homedecor_alarm_clock_back.png
index faee42d..faee42d 100644
--- a/homedecor/textures/homedecor_alarm_clock_back.png
+++ b/homedecor_clocks/textures/homedecor_alarm_clock_back.png
diff --git a/homedecor/textures/homedecor_alarm_clock_bottom.png b/homedecor_clocks/textures/homedecor_alarm_clock_bottom.png
index 136e39e..136e39e 100644
--- a/homedecor/textures/homedecor_alarm_clock_bottom.png
+++ b/homedecor_clocks/textures/homedecor_alarm_clock_bottom.png
diff --git a/homedecor/textures/homedecor_alarm_clock_front.png b/homedecor_clocks/textures/homedecor_alarm_clock_front.png
index 8ada01a..8ada01a 100644
--- a/homedecor/textures/homedecor_alarm_clock_front.png
+++ b/homedecor_clocks/textures/homedecor_alarm_clock_front.png
diff --git a/homedecor/textures/homedecor_alarm_clock_inv.png b/homedecor_clocks/textures/homedecor_alarm_clock_inv.png
index ebb882c..ebb882c 100644
--- a/homedecor/textures/homedecor_alarm_clock_inv.png
+++ b/homedecor_clocks/textures/homedecor_alarm_clock_inv.png
diff --git a/homedecor/textures/homedecor_alarm_clock_sides.png b/homedecor_clocks/textures/homedecor_alarm_clock_sides.png
index 372e77e..372e77e 100644
--- a/homedecor/textures/homedecor_alarm_clock_sides.png
+++ b/homedecor_clocks/textures/homedecor_alarm_clock_sides.png
diff --git a/homedecor/textures/homedecor_alarm_clock_top.png b/homedecor_clocks/textures/homedecor_alarm_clock_top.png
index d1978e6..d1978e6 100644
--- a/homedecor/textures/homedecor_alarm_clock_top.png
+++ b/homedecor_clocks/textures/homedecor_alarm_clock_top.png
diff --git a/homedecor/textures/homedecor_analog_clock_back.png b/homedecor_clocks/textures/homedecor_analog_clock_back.png
index 0de135b..0de135b 100644
--- a/homedecor/textures/homedecor_analog_clock_back.png
+++ b/homedecor_clocks/textures/homedecor_analog_clock_back.png
diff --git a/homedecor/textures/homedecor_analog_clock_face.png b/homedecor_clocks/textures/homedecor_analog_clock_face.png
index ff0d0ec..ff0d0ec 100644
--- a/homedecor/textures/homedecor_analog_clock_face.png
+++ b/homedecor_clocks/textures/homedecor_analog_clock_face.png
diff --git a/homedecor/textures/homedecor_analog_clock_plastic_inv.png b/homedecor_clocks/textures/homedecor_analog_clock_plastic_inv.png
index 990c4a7..990c4a7 100644
--- a/homedecor/textures/homedecor_analog_clock_plastic_inv.png
+++ b/homedecor_clocks/textures/homedecor_analog_clock_plastic_inv.png
diff --git a/homedecor/textures/homedecor_analog_clock_wood_inv.png b/homedecor_clocks/textures/homedecor_analog_clock_wood_inv.png
index b378783..b378783 100644
--- a/homedecor/textures/homedecor_analog_clock_wood_inv.png
+++ b/homedecor_clocks/textures/homedecor_analog_clock_wood_inv.png
diff --git a/homedecor/textures/homedecor_digital_clock_back.png b/homedecor_clocks/textures/homedecor_digital_clock_back.png
index f4ddf49..f4ddf49 100644
--- a/homedecor/textures/homedecor_digital_clock_back.png
+++ b/homedecor_clocks/textures/homedecor_digital_clock_back.png
diff --git a/homedecor/textures/homedecor_digital_clock_edges.png b/homedecor_clocks/textures/homedecor_digital_clock_edges.png
index 03ea8cd..03ea8cd 100644
--- a/homedecor/textures/homedecor_digital_clock_edges.png
+++ b/homedecor_clocks/textures/homedecor_digital_clock_edges.png
diff --git a/homedecor/textures/homedecor_digital_clock_front.png b/homedecor_clocks/textures/homedecor_digital_clock_front.png
index 02c02cf..02c02cf 100644
--- a/homedecor/textures/homedecor_digital_clock_front.png
+++ b/homedecor_clocks/textures/homedecor_digital_clock_front.png
diff --git a/homedecor/textures/homedecor_digital_clock_inv.png b/homedecor_clocks/textures/homedecor_digital_clock_inv.png
index ad9a657..ad9a657 100644
--- a/homedecor/textures/homedecor_digital_clock_inv.png
+++ b/homedecor_clocks/textures/homedecor_digital_clock_inv.png
diff --git a/homedecor/textures/homedecor_grandfather_clock_face.png b/homedecor_clocks/textures/homedecor_grandfather_clock_face.png
index de61fbc..de61fbc 100644
--- a/homedecor/textures/homedecor_grandfather_clock_face.png
+++ b/homedecor_clocks/textures/homedecor_grandfather_clock_face.png
diff --git a/homedecor/textures/homedecor_grandfather_clock_face_edge.png b/homedecor_clocks/textures/homedecor_grandfather_clock_face_edge.png
index 7991f3b..7991f3b 100644
--- a/homedecor/textures/homedecor_grandfather_clock_face_edge.png
+++ b/homedecor_clocks/textures/homedecor_grandfather_clock_face_edge.png
diff --git a/homedecor/textures/homedecor_grandfather_clock_inv.png b/homedecor_clocks/textures/homedecor_grandfather_clock_inv.png
index 26b25e9..26b25e9 100644
--- a/homedecor/textures/homedecor_grandfather_clock_inv.png
+++ b/homedecor_clocks/textures/homedecor_grandfather_clock_inv.png
diff --git a/homedecor_cobweb/depends.txt b/homedecor_cobweb/depends.txt
new file mode 100644
index 0000000..917d513
--- /dev/null
+++ b/homedecor_cobweb/depends.txt
@@ -0,0 +1,2 @@
+homedecor_common
+default
diff --git a/homedecor/cobweb.lua b/homedecor_cobweb/init.lua
index 43b7794..eae886e 100644
--- a/homedecor/cobweb.lua
+++ b/homedecor_cobweb/init.lua
@@ -1,7 +1,7 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
-minetest.register_node("homedecor:cobweb_corner", {
+minetest.register_node(":homedecor:cobweb_corner", {
 	description = S("Cobweb"),
 	drawtype = "torchlike",
 	tiles = { "homedecor_cobweb_torchlike.png" },
@@ -25,7 +25,7 @@ minetest.register_node("homedecor:cobweb_corner", {
 	end
 })
 
-minetest.register_node("homedecor:cobweb_centered", {
+minetest.register_node(":Lhomedecor:cobweb_centered", {
 	description = S("Cobweb"),
 	drawtype = "nodebox",
 	tiles = { "homedecor_cobweb.png" },
@@ -52,7 +52,7 @@ minetest.register_node("homedecor:cobweb_centered", {
 	drop = "homedecor:cobweb_corner"
 })
 
-minetest.register_node("homedecor:cobweb_flat", {
+minetest.register_node(":homedecor:cobweb_flat", {
 	description = S("Cobweb"),
 	drawtype = "nodebox",
 	tiles = { "homedecor_cobweb.png" },
@@ -79,7 +79,7 @@ minetest.register_node("homedecor:cobweb_flat", {
 	drop = "homedecor:cobweb_corner"
 })
 
-minetest.register_node("homedecor:cobweb_plantlike", {
+minetest.register_node(":homedecor:cobweb_plantlike", {
 	description = S("Cobweb"),
 	drawtype = "plantlike",
 	tiles = { "homedecor_cobweb_plantlike.png" },
@@ -158,13 +158,13 @@ function homedecor.rotate_cobweb(pos)
 
 end
 
--- convert existing cobwebs
+-- crafting
 
-minetest.register_abm({
-	nodenames = { "homedecor:cobweb" },
-	interval = 1,
-	chance = 1,
-	action = function(pos, node, active_object_count, active_object_count_wider)
-		homedecor.rotate_cobweb(pos)
-	end
+minetest.register_craft( {
+        output = "homedecor:cobweb_corner 5",
+        recipe = {
+			{ "farming:string", "", "farming:string" },
+			{ "", "farming:string", "" },
+			{ "farming:string", "", "farming:string" }
+        },
 })
diff --git a/homedecor/textures/homedecor_cobweb.png b/homedecor_cobweb/textures/homedecor_cobweb.png
index 9e8cdc6..9e8cdc6 100644
--- a/homedecor/textures/homedecor_cobweb.png
+++ b/homedecor_cobweb/textures/homedecor_cobweb.png
diff --git a/homedecor/textures/homedecor_cobweb_plantlike.png b/homedecor_cobweb/textures/homedecor_cobweb_plantlike.png
index 593f59e..593f59e 100644
--- a/homedecor/textures/homedecor_cobweb_plantlike.png
+++ b/homedecor_cobweb/textures/homedecor_cobweb_plantlike.png
diff --git a/homedecor/textures/homedecor_cobweb_torchlike.png b/homedecor_cobweb/textures/homedecor_cobweb_torchlike.png
index 827d7bf..827d7bf 100644
--- a/homedecor/textures/homedecor_cobweb_torchlike.png
+++ b/homedecor_cobweb/textures/homedecor_cobweb_torchlike.png
diff --git a/homedecor_common/crafts.lua b/homedecor_common/crafts.lua
new file mode 100644
index 0000000..547ef18
--- /dev/null
+++ b/homedecor_common/crafts.lua
@@ -0,0 +1,73 @@
+-- crafts for common items that are used by more than one home decor component
+
+local S = homedecor.gettext
+
+-- items
+
+minetest.register_craftitem(":homedecor:roof_tile_terracotta", {
+        description = S("Terracotta Roof Tile"),
+        inventory_image = "homedecor_roof_tile_terracotta.png",
+})
+
+minetest.register_craftitem(":homedecor:drawer_small", {
+        description = S("Small Wooden Drawer"),
+        inventory_image = "homedecor_drawer_small.png",
+})
+
+-- cooking/fuel
+
+minetest.register_craft({
+        type = "cooking",
+        output = "homedecor:roof_tile_terracotta",
+        recipe = "basic_materials:terracotta_base",
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:shingles_wood",
+        burntime = 30,
+})
+
+
+-- crafing
+
+minetest.register_craft( {
+        output = "homedecor:shingles_terracotta",
+        recipe = {
+                { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"},
+                { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta"},
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:roof_tile_terracotta 8",
+        recipe = {
+			{ "homedecor:shingles_terracotta", "homedecor:shingles_terracotta" }
+		}
+})
+
+minetest.register_craft( {
+        output = "homedecor:shingles_wood 12",
+        recipe = {
+                { "group:stick", "group:wood"},
+                { "group:wood", "group:stick"},
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:shingles_wood 12",
+        recipe = {
+                { "group:wood", "group:stick"},
+                { "group:stick", "group:wood"},
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:shingles_asphalt 6",
+        recipe = {
+                { "building_blocks:gravel_spread", "dye:black", "building_blocks:gravel_spread" },
+                { "group:sand", "dye:black", "group:sand" },
+                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+        },
+})
+
diff --git a/homedecor_common/depends.txt b/homedecor_common/depends.txt
new file mode 100644
index 0000000..a78a220
--- /dev/null
+++ b/homedecor_common/depends.txt
@@ -0,0 +1,3 @@
+default
+creative
+
diff --git a/homedecor/handlers/expansion.lua b/homedecor_common/expansion.lua
index bd87e90..26efc6a 100644
--- a/homedecor/handlers/expansion.lua
+++ b/homedecor_common/expansion.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 -- vectors to place one node next to or behind another
 
diff --git a/homedecor/handlers/furnaces.lua b/homedecor_common/furnaces.lua
index 36a7939..d628273 100644
--- a/homedecor/handlers/furnaces.lua
+++ b/homedecor_common/furnaces.lua
@@ -1,6 +1,6 @@
 -- This code supplies an oven/stove. Basically it's just a copy of the default furnace with different textures.
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local function swap_node(pos, name)
 	local node = minetest.get_node(pos)
diff --git a/homedecor/init.lua b/homedecor_common/init.lua
index 1b54359..6d81c44 100644
--- a/homedecor/init.lua
+++ b/homedecor_common/init.lua
@@ -1,19 +1,16 @@
--- Home Decor mod by VanessaE
---
--- Mostly my own code, with bits and pieces lifted from Minetest's default
--- lua files and from ironzorg's flowers mod.  Many thanks to GloopMaster
--- for helping me figure out the inventories used in the nightstands/dressers.
---
--- The code for ovens, nightstands, refrigerators are basically modified
--- copies of the code for chests and furnaces.
+-- Home Decor API/functions, and common textures and models
+-- by VanessaE
 
-local modpath = minetest.get_modpath("homedecor")
-
-local S = homedecor_i18n.gettext
+local modpath = minetest.get_modpath("homedecor_common")
 
 homedecor = {}
 homedecor.modpath = modpath
 
+-- Intllib support
+homedecor.gettext, homedecor.ngettext = dofile(modpath.."/intllib.lua")
+
+local S = homedecor.gettext
+
 -- Determine if the item being pointed at is the underside of a node (e.g a ceiling)
 function homedecor.find_ceiling(itemstack, placer, pointed_thing)
 	-- most of this is copied from the rotate-and-place function in builtin
@@ -70,55 +67,16 @@ homedecor.color_dark_grey = 0xff606060
 homedecor.color_med_grey  = 0xffa0a0a0
 
 -- load different handler subsystems
-dofile(modpath.."/handlers/init.lua")
-
--- load various other components
-dofile(modpath.."/misc-nodes.lua")					-- the catch-all for all misc nodes
-dofile(modpath.."/tables.lua")
-dofile(modpath.."/electronics.lua")
-dofile(modpath.."/shutters.lua")
-
-dofile(modpath.."/roofing.lua")
-
-dofile(modpath.."/foyer.lua")
-
-dofile(modpath.."/doors_and_gates.lua")
-
-dofile(modpath.."/fences.lua")
-
-dofile(modpath.."/lighting.lua")
-
-dofile(modpath.."/kitchen_appliances.lua")
-dofile(modpath.."/kitchen_furniture.lua")
-dofile(modpath.."/gastronomy.lua")
-
-dofile(modpath.."/bathroom_furniture.lua")
-dofile(modpath.."/bathroom_sanitation.lua")
-
-dofile(modpath.."/bedroom.lua")
-
-dofile(modpath.."/laundry.lua")
-
-dofile(modpath.."/office.lua")
-
-dofile(modpath.."/clocks.lua")
-dofile(modpath.."/electrics.lua")
-
-dofile(modpath.."/window_treatments.lua")
-
-dofile(modpath.."/furniture.lua")
-dofile(modpath.."/furniture_medieval.lua")
-dofile(modpath.."/furniture_recipes.lua")
-dofile(modpath.."/climate-control.lua")
-
-dofile(modpath.."/cobweb.lua")
-dofile(modpath.."/books.lua")
-dofile(modpath.."/exterior.lua")
-dofile(modpath.."/trash_cans.lua")
-dofile(modpath.."/wardrobe.lua")
-
+dofile(modpath.."/nodeboxes.lua")
+dofile(modpath.."/expansion.lua")
+dofile(modpath.."/furnaces.lua")
+dofile(modpath.."/inventory.lua")
+dofile(modpath.."/registration.lua")
+dofile(modpath.."/water_particles.lua")
+dofile(modpath.."/mt_game_beds_functions.lua")
+dofile(modpath.."/sit.lua")
 dofile(modpath.."/crafts.lua")
 
 if minetest.settings:get_bool("log_mod") then
-	minetest.log("action", "[HomeDecor] " .. S("Loaded!"))
+	minetest.log("action", "[HomeDecor API] " .. S("Loaded!"))
 end
diff --git a/homedecor_i18n/intllib.lua b/homedecor_common/intllib.lua
index 6669d72..6669d72 100644
--- a/homedecor_i18n/intllib.lua
+++ b/homedecor_common/intllib.lua
diff --git a/homedecor/handlers/inventory.lua b/homedecor_common/inventory.lua
index dd09133..2a49228 100644
--- a/homedecor/handlers/inventory.lua
+++ b/homedecor_common/inventory.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local default_can_dig = function(pos,player)
 	local meta = minetest.get_meta(pos)
diff --git a/homedecor_i18n/locale/de.po b/homedecor_common/locale/de.po
index 13f576f..13f576f 100644
--- a/homedecor_i18n/locale/de.po
+++ b/homedecor_common/locale/de.po
diff --git a/homedecor_i18n/locale/es.po b/homedecor_common/locale/es.po
index 30c3d4b..30c3d4b 100644
--- a/homedecor_i18n/locale/es.po
+++ b/homedecor_common/locale/es.po
diff --git a/homedecor_i18n/locale/fr.po b/homedecor_common/locale/fr.po
index a7f8f06..a7f8f06 100644
--- a/homedecor_i18n/locale/fr.po
+++ b/homedecor_common/locale/fr.po
diff --git a/homedecor_i18n/locale/it.po b/homedecor_common/locale/it.po
index d3263f2..d3263f2 100644
--- a/homedecor_i18n/locale/it.po
+++ b/homedecor_common/locale/it.po
diff --git a/homedecor_i18n/locale/ms.po b/homedecor_common/locale/ms.po
index 94e5a29..94e5a29 100644
--- a/homedecor_i18n/locale/ms.po
+++ b/homedecor_common/locale/ms.po
diff --git a/homedecor_i18n/locale/pt.po b/homedecor_common/locale/pt.po
index b87c6a2..b87c6a2 100644
--- a/homedecor_i18n/locale/pt.po
+++ b/homedecor_common/locale/pt.po
diff --git a/homedecor_i18n/locale/pt_BR.po b/homedecor_common/locale/pt_BR.po
index b87c6a2..b87c6a2 100644
--- a/homedecor_i18n/locale/pt_BR.po
+++ b/homedecor_common/locale/pt_BR.po
diff --git a/homedecor_i18n/locale/ru.po b/homedecor_common/locale/ru.po
index 1e1dd1e..1e1dd1e 100644
--- a/homedecor_i18n/locale/ru.po
+++ b/homedecor_common/locale/ru.po
diff --git a/homedecor_i18n/locale/template.pot b/homedecor_common/locale/template.pot
index 44f256f..44f256f 100644
--- a/homedecor_i18n/locale/template.pot
+++ b/homedecor_common/locale/template.pot
diff --git a/homedecor/models/homedecor_cube.obj b/homedecor_common/models/homedecor_cube.obj
index d0a1899..d0a1899 100644
--- a/homedecor/models/homedecor_cube.obj
+++ b/homedecor_common/models/homedecor_cube.obj
diff --git a/homedecor/models/homedecor_slope.obj b/homedecor_common/models/homedecor_slope.obj
index c3ab158..c3ab158 100644
--- a/homedecor/models/homedecor_slope.obj
+++ b/homedecor_common/models/homedecor_slope.obj
diff --git a/homedecor/models/homedecor_slope_inner_corner.obj b/homedecor_common/models/homedecor_slope_inner_corner.obj
index 6f273a4..6f273a4 100644
--- a/homedecor/models/homedecor_slope_inner_corner.obj
+++ b/homedecor_common/models/homedecor_slope_inner_corner.obj
diff --git a/homedecor/models/homedecor_slope_outer_corner.obj b/homedecor_common/models/homedecor_slope_outer_corner.obj
index 2408acf..2408acf 100644
--- a/homedecor/models/homedecor_slope_outer_corner.obj
+++ b/homedecor_common/models/homedecor_slope_outer_corner.obj
diff --git a/homedecor/handlers/mt_game_beds_functions.lua b/homedecor_common/mt_game_beds_functions.lua
index 8c93763..8c93763 100644
--- a/homedecor/handlers/mt_game_beds_functions.lua
+++ b/homedecor_common/mt_game_beds_functions.lua
diff --git a/homedecor/handlers/nodeboxes.lua b/homedecor_common/nodeboxes.lua
index c0a7df7..c0a7df7 100644
--- a/homedecor/handlers/nodeboxes.lua
+++ b/homedecor_common/nodeboxes.lua
diff --git a/homedecor/handlers/registration.lua b/homedecor_common/registration.lua
index 8c20558..f2d9bff 100644
--- a/homedecor/handlers/registration.lua
+++ b/homedecor_common/registration.lua
@@ -91,5 +91,5 @@ function homedecor.register(name, original_def)
 	end
 
 	-- register the actual minetest node
-	minetest.register_node("homedecor:" .. name, def)
+	minetest.register_node(":homedecor:" .. name, def)
 end
diff --git a/homedecor/handlers/sit.lua b/homedecor_common/sit.lua
index fc49177..fc49177 100644
--- a/homedecor/handlers/sit.lua
+++ b/homedecor_common/sit.lua
diff --git a/homedecor/textures/homedecor_blanktile.png b/homedecor_common/textures/homedecor_blanktile.png
index c22f319..c22f319 100644
--- a/homedecor/textures/homedecor_blanktile.png
+++ b/homedecor_common/textures/homedecor_blanktile.png
diff --git a/homedecor/textures/homedecor_drawer_small.png b/homedecor_common/textures/homedecor_drawer_small.png
index 2958a0e..2958a0e 100644
--- a/homedecor/textures/homedecor_drawer_small.png
+++ b/homedecor_common/textures/homedecor_drawer_small.png
diff --git a/homedecor/textures/homedecor_generic_metal.png b/homedecor_common/textures/homedecor_generic_metal.png
index 3a7c063..3a7c063 100644
--- a/homedecor/textures/homedecor_generic_metal.png
+++ b/homedecor_common/textures/homedecor_generic_metal.png
diff --git a/homedecor/textures/homedecor_generic_metal_brass.png b/homedecor_common/textures/homedecor_generic_metal_brass.png
index e2fb20d..e2fb20d 100644
--- a/homedecor/textures/homedecor_generic_metal_brass.png
+++ b/homedecor_common/textures/homedecor_generic_metal_brass.png
diff --git a/homedecor/textures/homedecor_generic_metal_bright.png b/homedecor_common/textures/homedecor_generic_metal_bright.png
index da12452..da12452 100644
--- a/homedecor/textures/homedecor_generic_metal_bright.png
+++ b/homedecor_common/textures/homedecor_generic_metal_bright.png
diff --git a/homedecor/textures/homedecor_generic_metal_gold.png b/homedecor_common/textures/homedecor_generic_metal_gold.png
index dda7f2d..dda7f2d 100644
--- a/homedecor/textures/homedecor_generic_metal_gold.png
+++ b/homedecor_common/textures/homedecor_generic_metal_gold.png
diff --git a/homedecor/textures/homedecor_generic_metal_gold2.png b/homedecor_common/textures/homedecor_generic_metal_gold2.png
index e549900..e549900 100644
--- a/homedecor/textures/homedecor_generic_metal_gold2.png
+++ b/homedecor_common/textures/homedecor_generic_metal_gold2.png
diff --git a/homedecor/textures/homedecor_generic_metal_lines_overlay.png b/homedecor_common/textures/homedecor_generic_metal_lines_overlay.png
index 1b7af73..1b7af73 100644
--- a/homedecor/textures/homedecor_generic_metal_lines_overlay.png
+++ b/homedecor_common/textures/homedecor_generic_metal_lines_overlay.png
diff --git a/homedecor/textures/homedecor_generic_metal_wrought_iron.png b/homedecor_common/textures/homedecor_generic_metal_wrought_iron.png
index b98e3bc..b98e3bc 100644
--- a/homedecor/textures/homedecor_generic_metal_wrought_iron.png
+++ b/homedecor_common/textures/homedecor_generic_metal_wrought_iron.png
diff --git a/homedecor/textures/homedecor_generic_plastic.png b/homedecor_common/textures/homedecor_generic_plastic.png
index 44cdc6a..44cdc6a 100644
--- a/homedecor/textures/homedecor_generic_plastic.png
+++ b/homedecor_common/textures/homedecor_generic_plastic.png
diff --git a/homedecor/textures/homedecor_generic_quilted_paper.png b/homedecor_common/textures/homedecor_generic_quilted_paper.png
index c2de1d8..c2de1d8 100644
--- a/homedecor/textures/homedecor_generic_quilted_paper.png
+++ b/homedecor_common/textures/homedecor_generic_quilted_paper.png
diff --git a/homedecor/textures/homedecor_generic_terrycloth.png b/homedecor_common/textures/homedecor_generic_terrycloth.png
index 7265e3c..7265e3c 100644
--- a/homedecor/textures/homedecor_generic_terrycloth.png
+++ b/homedecor_common/textures/homedecor_generic_terrycloth.png
diff --git a/homedecor/textures/homedecor_generic_wood_luxury.png b/homedecor_common/textures/homedecor_generic_wood_luxury.png
index 3387c3b..3387c3b 100644
--- a/homedecor/textures/homedecor_generic_wood_luxury.png
+++ b/homedecor_common/textures/homedecor_generic_wood_luxury.png
diff --git a/homedecor/textures/homedecor_generic_wood_old.png b/homedecor_common/textures/homedecor_generic_wood_old.png
index 0111890..0111890 100644
--- a/homedecor/textures/homedecor_generic_wood_old.png
+++ b/homedecor_common/textures/homedecor_generic_wood_old.png
diff --git a/homedecor/textures/homedecor_generic_wood_plain.png b/homedecor_common/textures/homedecor_generic_wood_plain.png
index 04d3a91..04d3a91 100644
--- a/homedecor/textures/homedecor_generic_wood_plain.png
+++ b/homedecor_common/textures/homedecor_generic_wood_plain.png
diff --git a/homedecor/textures/homedecor_generic_wood_red.png b/homedecor_common/textures/homedecor_generic_wood_red.png
index f2a3088..f2a3088 100644
--- a/homedecor/textures/homedecor_generic_wood_red.png
+++ b/homedecor_common/textures/homedecor_generic_wood_red.png
diff --git a/homedecor/textures/homedecor_light.png b/homedecor_common/textures/homedecor_light.png
index ca304e9..ca304e9 100644
--- a/homedecor/textures/homedecor_light.png
+++ b/homedecor_common/textures/homedecor_light.png
diff --git a/homedecor/textures/homedecor_polished_copper.png b/homedecor_common/textures/homedecor_polished_copper.png
index 672abe2..672abe2 100644
--- a/homedecor/textures/homedecor_polished_copper.png
+++ b/homedecor_common/textures/homedecor_polished_copper.png
diff --git a/homedecor/textures/homedecor_roof_tile_terracotta.png b/homedecor_common/textures/homedecor_roof_tile_terracotta.png
index e57a135..e57a135 100644
--- a/homedecor/textures/homedecor_roof_tile_terracotta.png
+++ b/homedecor_common/textures/homedecor_roof_tile_terracotta.png
diff --git a/homedecor/textures/homedecor_shingles_asphalt.png b/homedecor_common/textures/homedecor_shingles_asphalt.png
index 8086a16..8086a16 100644
--- a/homedecor/textures/homedecor_shingles_asphalt.png
+++ b/homedecor_common/textures/homedecor_shingles_asphalt.png
diff --git a/homedecor/textures/homedecor_shingles_terracotta.png b/homedecor_common/textures/homedecor_shingles_terracotta.png
index 4dc43a7..4dc43a7 100644
--- a/homedecor/textures/homedecor_shingles_terracotta.png
+++ b/homedecor_common/textures/homedecor_shingles_terracotta.png
diff --git a/homedecor/textures/homedecor_shingles_terracotta_inv.png b/homedecor_common/textures/homedecor_shingles_terracotta_inv.png
index 6b02cb8..6b02cb8 100644
--- a/homedecor/textures/homedecor_shingles_terracotta_inv.png
+++ b/homedecor_common/textures/homedecor_shingles_terracotta_inv.png
diff --git a/homedecor/textures/homedecor_shingles_wood.png b/homedecor_common/textures/homedecor_shingles_wood.png
index 46781f1..46781f1 100644
--- a/homedecor/textures/homedecor_shingles_wood.png
+++ b/homedecor_common/textures/homedecor_shingles_wood.png
diff --git a/homedecor/textures/homedecor_water_particle.png b/homedecor_common/textures/homedecor_water_particle.png
index 58a2a2d..58a2a2d 100644
--- a/homedecor/textures/homedecor_water_particle.png
+++ b/homedecor_common/textures/homedecor_water_particle.png
diff --git a/homedecor_i18n/tools/updatepo.sh b/homedecor_common/tools/updatepo.sh
index 52de990..52de990 100755
--- a/homedecor_i18n/tools/updatepo.sh
+++ b/homedecor_common/tools/updatepo.sh
diff --git a/homedecor/handlers/water_particles.lua b/homedecor_common/water_particles.lua
index 8042599..8042599 100644
--- a/homedecor/handlers/water_particles.lua
+++ b/homedecor_common/water_particles.lua
diff --git a/homedecor_doors_and_gates/depends.txt b/homedecor_doors_and_gates/depends.txt
new file mode 100644
index 0000000..b93a08f
--- /dev/null
+++ b/homedecor_doors_and_gates/depends.txt
@@ -0,0 +1,6 @@
+homedecor_common
+default
+basic_materials
+dye
+doors
+mesecons?
diff --git a/homedecor/doors_and_gates.lua b/homedecor_doors_and_gates/init.lua
index afcc7ff..1435cbe 100644
--- a/homedecor/doors_and_gates.lua
+++ b/homedecor_doors_and_gates/init.lua
@@ -1,10 +1,13 @@
 -- Node definitions for Homedecor doors
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local function N_(x) return x end
 
-local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
+local m_rules
+if minetest.global_exists("mesecon") then
+	m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
+end
 
 -- doors
 
@@ -224,7 +227,7 @@ for i, side in ipairs(sides) do
 			groups = {snappy = 3, not_in_creative_inventory = 1}
 		end
 
-		minetest.register_node("homedecor:door_"..doorname.."_"..side, {
+		minetest.register_node(":homedecor:door_"..doorname.."_"..side, {
 			description = S(door_model.description, S(side)),
 			drawtype = "mesh",
 			mesh = mesh,
@@ -411,7 +414,7 @@ for i, g in ipairs(gate_list) do
 
     -- gates when placed default to closed, closed.
 
-	minetest.register_node("homedecor:gate_"..gate.."_closed", def)
+	minetest.register_node(":homedecor:gate_"..gate.."_closed", def)
 
     -- this is either a terrible idea or a great one
     def = table.copy(def)
@@ -436,7 +439,7 @@ for i, g in ipairs(gate_list) do
         action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end
     }
 
-	minetest.register_node("homedecor:gate_"..gate.."_open", def)
+	minetest.register_node(":homedecor:gate_"..gate.."_open", def)
 end
 
 minetest.register_alias("homedecor:fence_barbed_wire_gate_open",    "homedecor:gate_barbed_wire_open")
@@ -533,7 +536,7 @@ local jp_cbox = {
 	fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625},
 }
 
-minetest.register_node("homedecor:japanese_wall_top", {
+minetest.register_node(":homedecor:japanese_wall_top", {
 	description = S("Japanese wall (top)"),
 	drawtype = "mesh",
 	mesh = "homedecor_wall_japanese_top.obj",
@@ -549,7 +552,7 @@ minetest.register_node("homedecor:japanese_wall_top", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-minetest.register_node("homedecor:japanese_wall_middle", {
+minetest.register_node(":homedecor:japanese_wall_middle", {
 	description = S("Japanese wall"),
 	drawtype = "mesh",
 	mesh = "homedecor_wall_japanese_middle.obj",
@@ -565,7 +568,7 @@ minetest.register_node("homedecor:japanese_wall_middle", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-minetest.register_node("homedecor:japanese_wall_bottom", {
+minetest.register_node(":homedecor:japanese_wall_bottom", {
 	description = S("Japanese wall (bottom)"),
 	drawtype = "mesh",
 	mesh = "homedecor_wall_japanese_bottom.obj",
@@ -581,27 +584,6 @@ minetest.register_node("homedecor:japanese_wall_bottom", {
 	sounds = default.node_sound_wood_defaults(),
 })
 
-minetest.register_node("homedecor:tatami_mat", {
-	tiles = {
-		"homedecor_tatami.png",
-		"homedecor_tatami.png",
-		"homedecor_tatami.png",
-		"homedecor_tatami.png",
-		"homedecor_tatami.png",
-		"homedecor_tatami.png"
-	},
-	description = S("Japanese tatami"),
-	drawtype = "nodebox",
-	paramtype = "light",
-	groups = {snappy=3},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
-		}
-	}
-})
-
 homedecor.register("door_japanese_closed", {
 	description = S("Japanese-style door"),
 	inventory_image = "homedecor_door_japanese_inv.png",
@@ -652,6 +634,246 @@ homedecor.register("door_japanese_open", {
 	drop = "homedecor:door_japanese_closed",
 })
 
+-- crafting
+
+-- Gates
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:gate_picket_white_closed",
+        recipe = {
+			"homedecor:fence_picket_white"
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:fence_picket_white",
+        recipe = {
+			"homedecor:gate_picket_white_closed"
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:gate_picket_closed",
+        recipe = {
+			"homedecor:fence_picket"
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:fence_picket",
+        recipe = {
+			"homedecor:gate_picket_closed"
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:gate_barbed_wire_closed",
+        recipe = {
+			"homedecor:fence_barbed_wire"
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:fence_barbed_wire",
+        recipe = {
+			"homedecor:gate_barbed_wire_closed"
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:gate_chainlink_closed",
+        recipe = {
+			"homedecor:fence_chainlink"
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:fence_chainlink",
+        recipe = {
+			"homedecor:gate_chainlink_closed"
+        },
+})
+
+------ Doors
+
+-- plain wood, non-windowed
+
+minetest.register_craft( {
+        output = "homedecor:door_wood_plain_left 2",
+        recipe = {
+			{ "group:wood", "group:wood", "" },
+			{ "group:wood", "group:wood", "default:steel_ingot" },
+			{ "group:wood", "group:wood", "" },
+        },
+})
+
+-- fancy exterior
+
+minetest.register_craft( {
+        output = "homedecor:door_exterior_fancy_left 2",
+        recipe = {
+			{ "group:wood", "default:glass" },
+			{ "group:wood", "group:wood" },
+			{ "group:wood", "group:wood" },
+        },
+})
+
+-- wood and glass (grid style)
+
+-- bare
+
+minetest.register_craft( {
+        output = "homedecor:door_wood_glass_oak_left 2",
+        recipe = {
+			{ "default:glass", "group:wood" },
+			{ "group:wood", "default:glass" },
+			{ "default:glass", "group:wood" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:door_wood_glass_oak_left 2",
+        recipe = {
+			{ "group:wood", "default:glass" },
+			{ "default:glass", "group:wood" },
+			{ "group:wood", "default:glass" },
+        },
+})
+
+-- mahogany
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:door_wood_glass_mahogany_left 2",
+        recipe = {
+			"default:dirt",
+			"default:coal_lump",
+			"homedecor:door_wood_glass_oak_left",
+			"homedecor:door_wood_glass_oak_left"
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:door_wood_glass_mahogany_left 2",
+        recipe = {
+			"dye:brown",
+			"homedecor:door_wood_glass_oak_left",
+			"homedecor:door_wood_glass_oak_left"
+        },
+})
+
+-- white
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:door_wood_glass_white_left 2",
+        recipe = {
+			"dye:white",
+			"homedecor:door_wood_glass_oak_left",
+			"homedecor:door_wood_glass_oak_left"
+        },
+})
+
+-- Closet doors
+
+-- oak
+
+minetest.register_craft( {
+        output = "homedecor:door_closet_oak_left 2",
+        recipe = {
+			{ "", "group:stick", "group:stick" },
+			{ "default:steel_ingot", "group:stick", "group:stick" },
+			{ "", "group:stick", "group:stick" },
+        },
+})
+
+-- mahogany
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:door_closet_mahogany_left 2",
+        recipe = {
+			"homedecor:door_closet_oak_left",
+			"homedecor:door_closet_oak_left",
+			"default:dirt",
+			"default:coal_lump",
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:door_closet_mahogany_left 2",
+        recipe = {
+			"homedecor:door_closet_oak_left",
+			"homedecor:door_closet_oak_left",
+			"dye:brown"
+        },
+})
+
+-- wrought fence-like door
+
+minetest.register_craft( {
+        output = "homedecor:door_wrought_iron_left 2",
+        recipe = {
+			{ "homedecor:pole_wrought_iron", "default:iron_lump" },
+			{ "homedecor:pole_wrought_iron", "default:iron_lump" },
+			{ "homedecor:pole_wrought_iron", "default:iron_lump" }
+        },
+})
+
+-- bedroom door
+
+minetest.register_craft( {
+	output = "homedecor:door_bedroom_left",
+	recipe = {
+		{ "dye:white", "dye:white", "" },
+		{ "homedecor:door_wood_plain_left", "basic_materials:brass_ingot", "" },
+		{ "", "", "" },
+	},
+})
+
+-- woodglass door
+
+minetest.register_craft( {
+	output = "homedecor:door_woodglass_left",
+	recipe = {
+		{ "group:wood", "default:glass", "" },
+		{ "group:wood", "default:glass", "basic_materials:brass_ingot" },
+		{ "group:wood", "group:wood", "" },
+	},
+})
+
+-- woodglass door type 2
+
+minetest.register_craft( {
+	output = "homedecor:door_woodglass2_left",
+	recipe = {
+		{ "default:glass", "default:glass", "" },
+		{ "group:wood", "group:wood", "default:iron_lump" },
+		{ "group:wood", "group:wood", "" },
+	},
+})
+
+
+minetest.register_craft({
+	output = "homedecor:door_japanese_closed",
+	recipe = {
+		{ "homedecor:japanese_wall_top" },
+		{ "homedecor:japanese_wall_bottom" }
+	},
+})
+
+-- aliases
+
 minetest.register_alias("homedecor:jpn_door_top", "air")
 minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_closed")
 
diff --git a/homedecor/models/homedecor_door_closet.obj b/homedecor_doors_and_gates/models/homedecor_door_closet.obj
index 3cbfca7..3cbfca7 100644
--- a/homedecor/models/homedecor_door_closet.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_closet.obj
diff --git a/homedecor/models/homedecor_door_closet_right.obj b/homedecor_doors_and_gates/models/homedecor_door_closet_right.obj
index 196860b..196860b 100644
--- a/homedecor/models/homedecor_door_closet_right.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_closet_right.obj
diff --git a/homedecor/models/homedecor_door_fancy.obj b/homedecor_doors_and_gates/models/homedecor_door_fancy.obj
index 2996ee8..2996ee8 100644
--- a/homedecor/models/homedecor_door_fancy.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_fancy.obj
diff --git a/homedecor/models/homedecor_door_fancy_right.obj b/homedecor_doors_and_gates/models/homedecor_door_fancy_right.obj
index a7bab10..a7bab10 100644
--- a/homedecor/models/homedecor_door_fancy_right.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_fancy_right.obj
diff --git a/homedecor/models/homedecor_door_japanese_closed.obj b/homedecor_doors_and_gates/models/homedecor_door_japanese_closed.obj
index 813b4b6..813b4b6 100644
--- a/homedecor/models/homedecor_door_japanese_closed.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_japanese_closed.obj
diff --git a/homedecor/models/homedecor_door_japanese_open.obj b/homedecor_doors_and_gates/models/homedecor_door_japanese_open.obj
index 97942d0..97942d0 100644
--- a/homedecor/models/homedecor_door_japanese_open.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_japanese_open.obj
diff --git a/homedecor/models/homedecor_door_plain.obj b/homedecor_doors_and_gates/models/homedecor_door_plain.obj
index 035c0c0..035c0c0 100644
--- a/homedecor/models/homedecor_door_plain.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_plain.obj
diff --git a/homedecor/models/homedecor_door_plain_right.obj b/homedecor_doors_and_gates/models/homedecor_door_plain_right.obj
index f735e3e..f735e3e 100644
--- a/homedecor/models/homedecor_door_plain_right.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_plain_right.obj
diff --git a/homedecor/models/homedecor_door_wood_glass.obj b/homedecor_doors_and_gates/models/homedecor_door_wood_glass.obj
index b1b6b40..b1b6b40 100644
--- a/homedecor/models/homedecor_door_wood_glass.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_wood_glass.obj
diff --git a/homedecor/models/homedecor_door_wood_glass_right.obj b/homedecor_doors_and_gates/models/homedecor_door_wood_glass_right.obj
index 3c544b8..3c544b8 100644
--- a/homedecor/models/homedecor_door_wood_glass_right.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_wood_glass_right.obj
diff --git a/homedecor/models/homedecor_door_woodglass_typea.obj b/homedecor_doors_and_gates/models/homedecor_door_woodglass_typea.obj
index 68fbf86..68fbf86 100644
--- a/homedecor/models/homedecor_door_woodglass_typea.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_woodglass_typea.obj
diff --git a/homedecor/models/homedecor_door_woodglass_typea_right.obj b/homedecor_doors_and_gates/models/homedecor_door_woodglass_typea_right.obj
index 51c3e26..51c3e26 100644
--- a/homedecor/models/homedecor_door_woodglass_typea_right.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_woodglass_typea_right.obj
diff --git a/homedecor/models/homedecor_door_wrought_iron.obj b/homedecor_doors_and_gates/models/homedecor_door_wrought_iron.obj
index 6d89066..6d89066 100644
--- a/homedecor/models/homedecor_door_wrought_iron.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_wrought_iron.obj
diff --git a/homedecor/models/homedecor_door_wrought_iron_right.obj b/homedecor_doors_and_gates/models/homedecor_door_wrought_iron_right.obj
index fe55003..fe55003 100644
--- a/homedecor/models/homedecor_door_wrought_iron_right.obj
+++ b/homedecor_doors_and_gates/models/homedecor_door_wrought_iron_right.obj
diff --git a/homedecor/models/homedecor_wall_japanese_bottom.obj b/homedecor_doors_and_gates/models/homedecor_wall_japanese_bottom.obj
index 627df71..627df71 100644
--- a/homedecor/models/homedecor_wall_japanese_bottom.obj
+++ b/homedecor_doors_and_gates/models/homedecor_wall_japanese_bottom.obj
diff --git a/homedecor/models/homedecor_wall_japanese_middle.obj b/homedecor_doors_and_gates/models/homedecor_wall_japanese_middle.obj
index 31b3d70..31b3d70 100644
--- a/homedecor/models/homedecor_wall_japanese_middle.obj
+++ b/homedecor_doors_and_gates/models/homedecor_wall_japanese_middle.obj
diff --git a/homedecor/models/homedecor_wall_japanese_top.obj b/homedecor_doors_and_gates/models/homedecor_wall_japanese_top.obj
index 7d4f6af..7d4f6af 100644
--- a/homedecor/models/homedecor_wall_japanese_top.obj
+++ b/homedecor_doors_and_gates/models/homedecor_wall_japanese_top.obj
diff --git a/homedecor/textures/homedecor_door_bedroom.png b/homedecor_doors_and_gates/textures/homedecor_door_bedroom.png
index f94875f..f94875f 100644
--- a/homedecor/textures/homedecor_door_bedroom.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_bedroom.png
diff --git a/homedecor/textures/homedecor_door_bedroom_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_bedroom_inv.png
index f87065e..f87065e 100644
--- a/homedecor/textures/homedecor_door_bedroom_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_bedroom_inv.png
diff --git a/homedecor/textures/homedecor_door_closet_mahogany.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany.png
index e2f51f7..e2f51f7 100644
--- a/homedecor/textures/homedecor_door_closet_mahogany.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany.png
diff --git a/homedecor/textures/homedecor_door_closet_mahogany_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany_inv.png
index 08cd6f3..08cd6f3 100644
--- a/homedecor/textures/homedecor_door_closet_mahogany_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany_inv.png
diff --git a/homedecor/textures/homedecor_door_closet_oak.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_oak.png
index 9355e85..9355e85 100644
--- a/homedecor/textures/homedecor_door_closet_oak.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_closet_oak.png
diff --git a/homedecor/textures/homedecor_door_closet_oak_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_oak_inv.png
index 42cdc9b..42cdc9b 100644
--- a/homedecor/textures/homedecor_door_closet_oak_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_closet_oak_inv.png
diff --git a/homedecor/textures/homedecor_door_exterior_fancy.png b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy.png
index 9f89482..9f89482 100644
--- a/homedecor/textures/homedecor_door_exterior_fancy.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy.png
diff --git a/homedecor/textures/homedecor_door_exterior_fancy_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_insert.png
index ddc5d22..ddc5d22 100644
--- a/homedecor/textures/homedecor_door_exterior_fancy_insert.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_insert.png
diff --git a/homedecor/textures/homedecor_door_exterior_fancy_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_inv.png
index a7ec3f3..a7ec3f3 100644
--- a/homedecor/textures/homedecor_door_exterior_fancy_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_inv.png
diff --git a/homedecor/textures/homedecor_door_glass.png b/homedecor_doors_and_gates/textures/homedecor_door_glass.png
index 4e5ea5a..4e5ea5a 100644
--- a/homedecor/textures/homedecor_door_glass.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_glass.png
diff --git a/homedecor/textures/homedecor_door_glass_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_glass_inv.png
index fb5cd19..fb5cd19 100644
--- a/homedecor/textures/homedecor_door_glass_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_glass_inv.png
diff --git a/homedecor/textures/homedecor_door_japanese_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_japanese_inv.png
index 7c3a0a2..7c3a0a2 100644
--- a/homedecor/textures/homedecor_door_japanese_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_japanese_inv.png
diff --git a/homedecor/textures/homedecor_door_wood_glass_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_insert.png
index 892f306..892f306 100644
--- a/homedecor/textures/homedecor_door_wood_glass_insert.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_insert.png
diff --git a/homedecor/textures/homedecor_door_wood_glass_mahogany.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png
index ca0ca15..ca0ca15 100644
--- a/homedecor/textures/homedecor_door_wood_glass_mahogany.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png
diff --git a/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany_inv.png
index 36271dd..36271dd 100644
--- a/homedecor/textures/homedecor_door_wood_glass_mahogany_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany_inv.png
diff --git a/homedecor/textures/homedecor_door_wood_glass_oak.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png
index 0f08771..0f08771 100644
--- a/homedecor/textures/homedecor_door_wood_glass_oak.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png
diff --git a/homedecor/textures/homedecor_door_wood_glass_oak_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak_inv.png
index 5e4707c..5e4707c 100644
--- a/homedecor/textures/homedecor_door_wood_glass_oak_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak_inv.png
diff --git a/homedecor/textures/homedecor_door_wood_glass_white.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png
index 202e600..202e600 100644
--- a/homedecor/textures/homedecor_door_wood_glass_white.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png
diff --git a/homedecor/textures/homedecor_door_wood_glass_white_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white_inv.png
index 61c50ad..61c50ad 100644
--- a/homedecor/textures/homedecor_door_wood_glass_white_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white_inv.png
diff --git a/homedecor/textures/homedecor_door_wood_plain.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_plain.png
index 6b12552..6b12552 100644
--- a/homedecor/textures/homedecor_door_wood_plain.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_plain.png
diff --git a/homedecor/textures/homedecor_door_wood_plain_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_plain_inv.png
index 0e9e7a0..0e9e7a0 100644
--- a/homedecor/textures/homedecor_door_wood_plain_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_plain_inv.png
diff --git a/homedecor/textures/homedecor_door_woodglass2.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png
index ee8ca2b..ee8ca2b 100644
--- a/homedecor/textures/homedecor_door_woodglass2.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png
diff --git a/homedecor/textures/homedecor_door_woodglass2_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2_inv.png
index 9afd7cf..9afd7cf 100644
--- a/homedecor/textures/homedecor_door_woodglass2_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2_inv.png
diff --git a/homedecor/textures/homedecor_door_woodglass_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_inv.png
index 646e17c..646e17c 100644
--- a/homedecor/textures/homedecor_door_woodglass_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_inv.png
diff --git a/homedecor/textures/homedecor_door_woodglass_typea.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea.png
index 2d5902a..2d5902a 100644
--- a/homedecor/textures/homedecor_door_woodglass_typea.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea.png
diff --git a/homedecor/textures/homedecor_door_woodglass_typea_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea_insert.png
index 12fb2c6..12fb2c6 100644
--- a/homedecor/textures/homedecor_door_woodglass_typea_insert.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea_insert.png
diff --git a/homedecor/textures/homedecor_door_wrought_iron.png b/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron.png
index e39b46a..e39b46a 100644
--- a/homedecor/textures/homedecor_door_wrought_iron.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron.png
diff --git a/homedecor/textures/homedecor_door_wrought_iron_inv.png b/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron_inv.png
index 083b4c0..083b4c0 100644
--- a/homedecor/textures/homedecor_door_wrought_iron_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron_inv.png
diff --git a/homedecor/textures/homedecor_gate_barbed_wire_edges.png b/homedecor_doors_and_gates/textures/homedecor_gate_barbed_wire_edges.png
index 000185a..000185a 100644
--- a/homedecor/textures/homedecor_gate_barbed_wire_edges.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_barbed_wire_edges.png
diff --git a/homedecor/textures/homedecor_gate_barbed_wire_fb.png b/homedecor_doors_and_gates/textures/homedecor_gate_barbed_wire_fb.png
index 6cdc974..6cdc974 100644
--- a/homedecor/textures/homedecor_gate_barbed_wire_fb.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_barbed_wire_fb.png
diff --git a/homedecor/textures/homedecor_gate_chainlink_fb.png b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_fb.png
index 9453b45..9453b45 100644
--- a/homedecor/textures/homedecor_gate_chainlink_fb.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_fb.png
diff --git a/homedecor/textures/homedecor_gate_chainlink_lr.png b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_lr.png
index bd80d4c..bd80d4c 100644
--- a/homedecor/textures/homedecor_gate_chainlink_lr.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_lr.png
diff --git a/homedecor/textures/homedecor_gate_chainlink_tb.png b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_tb.png
index 8ced2b9..8ced2b9 100644
--- a/homedecor/textures/homedecor_gate_chainlink_tb.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_chainlink_tb.png
diff --git a/homedecor/textures/homedecor_gate_half_door_fb.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_fb.png
index c9be70a..c9be70a 100644
--- a/homedecor/textures/homedecor_gate_half_door_fb.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_fb.png
diff --git a/homedecor/textures/homedecor_gate_half_door_lr.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_lr.png
index 48329d8..48329d8 100644
--- a/homedecor/textures/homedecor_gate_half_door_lr.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_lr.png
diff --git a/homedecor/textures/homedecor_gate_half_door_tb.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_tb.png
index 03b360f..03b360f 100644
--- a/homedecor/textures/homedecor_gate_half_door_tb.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_tb.png
diff --git a/homedecor/textures/homedecor_gate_half_door_white_fb.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_fb.png
index ca5c5d1..ca5c5d1 100644
--- a/homedecor/textures/homedecor_gate_half_door_white_fb.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_fb.png
diff --git a/homedecor/textures/homedecor_gate_half_door_white_lr.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_lr.png
index 038d20d..038d20d 100644
--- a/homedecor/textures/homedecor_gate_half_door_white_lr.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_lr.png
diff --git a/homedecor/textures/homedecor_gate_half_door_white_tb.png b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_tb.png
index 2d592e7..2d592e7 100644
--- a/homedecor/textures/homedecor_gate_half_door_white_tb.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_half_door_white_tb.png
diff --git a/homedecor/textures/homedecor_gate_picket_back.png b/homedecor_doors_and_gates/textures/homedecor_gate_picket_back.png
index 8ab5c9c..8ab5c9c 100644
--- a/homedecor/textures/homedecor_gate_picket_back.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_picket_back.png
diff --git a/homedecor/textures/homedecor_gate_picket_front.png b/homedecor_doors_and_gates/textures/homedecor_gate_picket_front.png
index 858da6b..858da6b 100644
--- a/homedecor/textures/homedecor_gate_picket_front.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_picket_front.png
diff --git a/homedecor/textures/homedecor_gate_picket_white_back.png b/homedecor_doors_and_gates/textures/homedecor_gate_picket_white_back.png
index bb608de..bb608de 100644
--- a/homedecor/textures/homedecor_gate_picket_white_back.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_picket_white_back.png
diff --git a/homedecor/textures/homedecor_gate_picket_white_front.png b/homedecor_doors_and_gates/textures/homedecor_gate_picket_white_front.png
index a85aaa2..a85aaa2 100644
--- a/homedecor/textures/homedecor_gate_picket_white_front.png
+++ b/homedecor_doors_and_gates/textures/homedecor_gate_picket_white_front.png
diff --git a/homedecor/textures/homedecor_japanese_paper.png b/homedecor_doors_and_gates/textures/homedecor_japanese_paper.png
index b4a09d1..b4a09d1 100644
--- a/homedecor/textures/homedecor_japanese_paper.png
+++ b/homedecor_doors_and_gates/textures/homedecor_japanese_paper.png
diff --git a/homedecor/textures/homedecor_jpn_door_inv.png b/homedecor_doors_and_gates/textures/homedecor_jpn_door_inv.png
index 189fb58..189fb58 100644
--- a/homedecor/textures/homedecor_jpn_door_inv.png
+++ b/homedecor_doors_and_gates/textures/homedecor_jpn_door_inv.png
diff --git a/homedecor_electrical/depends.txt b/homedecor_electrical/depends.txt
new file mode 100644
index 0000000..fb5d601
--- /dev/null
+++ b/homedecor_electrical/depends.txt
@@ -0,0 +1,3 @@
+homedecor_common
+default
+basic_materials
diff --git a/homedecor/electrics.lua b/homedecor_electrical/init.lua
index c5f27a6..c135021 100644
--- a/homedecor/electrics.lua
+++ b/homedecor_electrical/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 homedecor.register("power_outlet", {
 	description = S("Power Outlet"),
@@ -79,3 +79,30 @@ homedecor.register("doorbell", {
 		})
 	end
 })
+
+-- crafting
+
+minetest.register_craft( {
+        output = "homedecor:power_outlet",
+        recipe = {
+			{"basic_materials:plastic_sheet", "basic_materials:copper_strip"},
+			{"basic_materials:plastic_sheet", ""},
+			{"basic_materials:plastic_sheet", "basic_materials:copper_strip"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:light_switch",
+        recipe = {
+			{"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"},
+			{"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:copper_strip"},
+			{"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:doorbell",
+        recipe = {
+			{ "homedecor:light_switch", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" }
+        },
+})
diff --git a/homedecor/sounds/homedecor_doorbell.ogg b/homedecor_electrical/sounds/homedecor_doorbell.ogg
index bdf4cea..bdf4cea 100644
--- a/homedecor/sounds/homedecor_doorbell.ogg
+++ b/homedecor_electrical/sounds/homedecor_doorbell.ogg
diff --git a/homedecor/textures/homedecor_doorbell.png b/homedecor_electrical/textures/homedecor_doorbell.png
index 03387d7..03387d7 100644
--- a/homedecor/textures/homedecor_doorbell.png
+++ b/homedecor_electrical/textures/homedecor_doorbell.png
diff --git a/homedecor/textures/homedecor_doorbell_inv.png b/homedecor_electrical/textures/homedecor_doorbell_inv.png
index 378b7a7..378b7a7 100644
--- a/homedecor/textures/homedecor_doorbell_inv.png
+++ b/homedecor_electrical/textures/homedecor_doorbell_inv.png
diff --git a/homedecor/textures/homedecor_light_switch_back.png b/homedecor_electrical/textures/homedecor_light_switch_back.png
index 8ad7c7e..8ad7c7e 100644
--- a/homedecor/textures/homedecor_light_switch_back.png
+++ b/homedecor_electrical/textures/homedecor_light_switch_back.png
diff --git a/homedecor/textures/homedecor_light_switch_edges.png b/homedecor_electrical/textures/homedecor_light_switch_edges.png
index 0db6f43..0db6f43 100644
--- a/homedecor/textures/homedecor_light_switch_edges.png
+++ b/homedecor_electrical/textures/homedecor_light_switch_edges.png
diff --git a/homedecor/textures/homedecor_light_switch_front.png b/homedecor_electrical/textures/homedecor_light_switch_front.png
index f91ab5e..f91ab5e 100644
--- a/homedecor/textures/homedecor_light_switch_front.png
+++ b/homedecor_electrical/textures/homedecor_light_switch_front.png
diff --git a/homedecor/textures/homedecor_light_switch_inv.png b/homedecor_electrical/textures/homedecor_light_switch_inv.png
index 80bf972..80bf972 100644
--- a/homedecor/textures/homedecor_light_switch_inv.png
+++ b/homedecor_electrical/textures/homedecor_light_switch_inv.png
diff --git a/homedecor/textures/homedecor_outlet_back.png b/homedecor_electrical/textures/homedecor_outlet_back.png
index 010dcb2..010dcb2 100644
--- a/homedecor/textures/homedecor_outlet_back.png
+++ b/homedecor_electrical/textures/homedecor_outlet_back.png
diff --git a/homedecor/textures/homedecor_outlet_edges.png b/homedecor_electrical/textures/homedecor_outlet_edges.png
index 1b86f80..1b86f80 100644
--- a/homedecor/textures/homedecor_outlet_edges.png
+++ b/homedecor_electrical/textures/homedecor_outlet_edges.png
diff --git a/homedecor/textures/homedecor_outlet_inv.png b/homedecor_electrical/textures/homedecor_outlet_inv.png
index 0cf5efd..0cf5efd 100644
--- a/homedecor/textures/homedecor_outlet_inv.png
+++ b/homedecor_electrical/textures/homedecor_outlet_inv.png
diff --git a/homedecor_electronics/depends.txt b/homedecor_electronics/depends.txt
new file mode 100644
index 0000000..6879386
--- /dev/null
+++ b/homedecor_electronics/depends.txt
@@ -0,0 +1,4 @@
+homedecor_common
+default
+basic_materials
+moreblocks?
diff --git a/homedecor_electronics/init.lua b/homedecor_electronics/init.lua
new file mode 100644
index 0000000..004a639
--- /dev/null
+++ b/homedecor_electronics/init.lua
@@ -0,0 +1,301 @@
+-- Various home electronics
+
+local S = homedecor.gettext
+
+homedecor.register("speaker", {
+	description = S("Large Stereo Speaker"),
+	mesh="homedecor_speaker_large.obj",
+	tiles = {
+		"homedecor_speaker_sides.png",
+		"homedecor_speaker_front.png"
+	},
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		minetest.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2})
+	end
+})
+
+homedecor.register("speaker_open", {
+	description = S("Large Stereo Speaker, open front"),
+	mesh="homedecor_speaker_large_open.obj",
+	tiles = {
+		"homedecor_speaker_sides.png",
+		"homedecor_speaker_driver.png",
+		"homedecor_speaker_open_front.png",
+		{ name = "homedecor_generic_metal.png", color = homedecor.color_black }
+	},
+	groups = { snappy = 3, not_in_creative_inventory=1 },
+	sounds = default.node_sound_wood_defaults(),
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2})
+	end
+})
+
+local spk_cbox = {
+	type = "fixed",
+	fixed = { -3/16, -8/16, 1/16, 3/16, -2/16, 7/16 }
+}
+
+homedecor.register("speaker_small", {
+	description = S("Small Surround Speaker"),
+	mesh="homedecor_speaker_small.obj",
+	tiles = {
+		"homedecor_speaker_sides.png",
+		"homedecor_speaker_front.png"
+	},
+	selection_box = spk_cbox,
+	walkable = false,
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+})
+
+homedecor.register("stereo", {
+	description = S("Stereo Receiver"),
+	tiles = { 'homedecor_stereo_top.png',
+			'homedecor_stereo_bottom.png',
+			'homedecor_stereo_left.png^[transformFX',
+			'homedecor_stereo_left.png',
+			'homedecor_stereo_back.png',
+			'homedecor_stereo_front.png'},
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+})
+
+homedecor.register("projection_screen", {
+	description = S("Projection Screen Material"),
+	drawtype = 'signlike',
+	tiles = { 'homedecor_projection_screen.png' },
+	wield_image = 'homedecor_projection_screen_inv.png',
+	inventory_image = 'homedecor_projection_screen_inv.png',
+	walkable = false,
+	groups = { snappy = 3 },
+	sounds = default.node_sound_leaves_defaults(),
+	paramtype2 = 'wallmounted',
+	selection_box = {
+		type = "wallmounted",
+		--wall_side = = <default>
+	},
+})
+
+homedecor.register("television", {
+	description = S("Small CRT Television"),
+	tiles = { 'homedecor_television_top.png',
+		  'homedecor_television_bottom.png',
+		  'homedecor_television_left.png^[transformFX',
+		  'homedecor_television_left.png',
+		  'homedecor_television_back.png',
+		   { name="homedecor_television_front_animated.png",
+			  animation={
+				type="vertical_frames",
+				aspect_w=16,
+				aspect_h=16,
+				length=80.0
+			  }
+		   }
+	},
+	light_source = default.LIGHT_MAX - 1,
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+})
+
+homedecor.register("dvd_vcr", {
+	description = S("DVD and VCR"),
+	tiles = {
+		"homedecor_dvdvcr_top.png",
+		"homedecor_dvdvcr_bottom.png",
+		"homedecor_dvdvcr_sides.png",
+		"homedecor_dvdvcr_sides.png^[transformFX",
+		"homedecor_dvdvcr_back.png",
+		"homedecor_dvdvcr_front.png",
+	},
+	inventory_image = "homedecor_dvdvcr_inv.png",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.3125, -0.5, -0.25, 0.3125, -0.375, 0.1875},
+			{-0.25, -0.5, -0.25, 0.25, -0.1875, 0.125},
+		}
+	},
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+})
+
+local tel_cbox = {
+	type = "fixed",
+	fixed = { -0.25, -0.5, -0.1875, 0.25, -0.21, 0.15 }
+}
+
+homedecor.register("telephone", {
+	mesh = "homedecor_telephone.obj",
+	tiles = {
+		"homedecor_telephone_dial.png",
+		"homedecor_telephone_base.png",
+		"homedecor_telephone_handset.png",
+		"homedecor_telephone_cord.png",
+	},
+	inventory_image = "homedecor_telephone_inv.png",
+	description = S("Telephone"),
+	groups = {snappy=3},
+	selection_box = tel_cbox,
+	walkable = false,
+	sounds = default.node_sound_wood_defaults(),
+})
+
+-- crafting
+
+minetest.register_craftitem(":homedecor:vcr", {
+	description = S("VCR"),
+	inventory_image = "homedecor_vcr.png"
+})
+
+minetest.register_craftitem(":homedecor:dvd_player", {
+	description = S("DVD Player"),
+	inventory_image = "homedecor_dvd_player.png"
+})
+
+minetest.register_craftitem(":homedecor:speaker_driver", {
+	description = S("Speaker driver"),
+	inventory_image = "homedecor_speaker_driver_inv.png"
+})
+
+minetest.register_craft( {
+        output = "homedecor:projection_screen 3",
+        recipe = {
+		{ "", "default:glass", "" },
+                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+        },
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:projection_screen",
+        burntime = 30,
+})
+
+
+minetest.register_craft( {
+	output = "basic_materials:ic 4",
+	recipe = {
+		{ "basic_materials:silicon", "basic_materials:silicon" },
+		{ "basic_materials:silicon", "default:copper_ingot" },
+	},
+})
+
+minetest.register_craft( {
+	output = "homedecor:television",
+	recipe = {
+		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "moreblocks:glow_glass", "basic_materials:plastic_sheet" },
+		{ "basic_materials:ic", "basic_materials:ic", "basic_materials:ic" },
+	},
+})
+
+minetest.register_craft( {
+	output = "homedecor:television",
+	recipe = {
+		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" },
+		{ "basic_materials:ic", "basic_materials:energy_crystal_simple", "basic_materials:ic" },
+	},
+})
+
+minetest.register_craft( {
+	output = "homedecor:stereo",
+	recipe = {
+		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" },
+		{ "default:steel_ingot", "basic_materials:ic", "default:steel_ingot" },
+	},
+})
+
+
+minetest.register_craft( {
+        output = "homedecor:speaker_driver 2",
+		recipe = {
+		{ "", "default:steel_ingot", "" },
+		{ "default:paper", "basic_materials:copper_wire", "default:iron_lump" },
+		{ "", "default:steel_ingot", "" },
+	},
+})
+
+minetest.register_craft( {
+        output = "homedecor:speaker_small",
+		recipe = {
+		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
+	},
+})
+
+minetest.register_craft( {
+        output = "homedecor:speaker",
+		recipe = {
+		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
+		{ "wool:black", "homedecor:speaker_driver", "group:wood" },
+		{ "wool:black", "group:wood", "group:wood" },
+	},
+})
+
+-- cotton version
+
+minetest.register_craft( {
+        output = "homedecor:speaker_small",
+		recipe = {
+		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
+	},
+})
+
+minetest.register_craft( {
+        output = "homedecor:speaker",
+		recipe = {
+		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
+		{ "cotton:black", "homedecor:speaker_driver", "group:wood" },
+		{ "cotton:black", "group:wood", "group:wood" },
+	},
+})
+
+
+minetest.register_craft({
+    output = "homedecor:vcr 2",
+    recipe = {
+		{ "basic_materials:ic", "default:steel_ingot", "basic_materials:plastic_sheet" },
+		{ "default:iron_lump", "default:iron_lump", "default:iron_lump" },
+		{ "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:dvd_player 2",
+    recipe = {
+		{ "", "basic_materials:plastic_sheet", "" },
+		{ "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" },
+		{ "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:dvd_player 2",
+    recipe = {
+		{ "", "basic_materials:plastic_sheet", "" },
+		{ "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" },
+		{ "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" },
+    },
+})
+
+minetest.register_craft({
+	type = "shapeless",
+    output = "homedecor:dvd_vcr",
+    recipe = {
+		"homedecor:vcr",
+		"homedecor:dvd_player"
+    },
+})
+
+minetest.register_craft( {
+        output = "homedecor:telephone",
+        recipe = {
+			{ "homedecor:speaker_driver", "basic_materials:copper_wire", "homedecor:speaker_driver" },
+			{ "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" },
+			{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
+})
diff --git a/homedecor/models/homedecor_speaker_large.obj b/homedecor_electronics/models/homedecor_speaker_large.obj
index 80436cd..80436cd 100644
--- a/homedecor/models/homedecor_speaker_large.obj
+++ b/homedecor_electronics/models/homedecor_speaker_large.obj
diff --git a/homedecor/models/homedecor_speaker_large_open.obj b/homedecor_electronics/models/homedecor_speaker_large_open.obj
index 7278f8b..7278f8b 100644
--- a/homedecor/models/homedecor_speaker_large_open.obj
+++ b/homedecor_electronics/models/homedecor_speaker_large_open.obj
diff --git a/homedecor/models/homedecor_speaker_small.obj b/homedecor_electronics/models/homedecor_speaker_small.obj
index b894889..b894889 100644
--- a/homedecor/models/homedecor_speaker_small.obj
+++ b/homedecor_electronics/models/homedecor_speaker_small.obj
diff --git a/homedecor/models/homedecor_telephone.obj b/homedecor_electronics/models/homedecor_telephone.obj
index a142714..a142714 100644
--- a/homedecor/models/homedecor_telephone.obj
+++ b/homedecor_electronics/models/homedecor_telephone.obj
diff --git a/homedecor/textures/homedecor_dvd_player.png b/homedecor_electronics/textures/homedecor_dvd_player.png
index 357a28d..357a28d 100644
--- a/homedecor/textures/homedecor_dvd_player.png
+++ b/homedecor_electronics/textures/homedecor_dvd_player.png
diff --git a/homedecor/textures/homedecor_dvdvcr_back.png b/homedecor_electronics/textures/homedecor_dvdvcr_back.png
index 2b125d8..2b125d8 100644
--- a/homedecor/textures/homedecor_dvdvcr_back.png
+++ b/homedecor_electronics/textures/homedecor_dvdvcr_back.png
diff --git a/homedecor/textures/homedecor_dvdvcr_bottom.png b/homedecor_electronics/textures/homedecor_dvdvcr_bottom.png
index b73ec44..b73ec44 100644
--- a/homedecor/textures/homedecor_dvdvcr_bottom.png
+++ b/homedecor_electronics/textures/homedecor_dvdvcr_bottom.png
diff --git a/homedecor/textures/homedecor_dvdvcr_front.png b/homedecor_electronics/textures/homedecor_dvdvcr_front.png
index c955ff5..c955ff5 100644
--- a/homedecor/textures/homedecor_dvdvcr_front.png
+++ b/homedecor_electronics/textures/homedecor_dvdvcr_front.png
diff --git a/homedecor/textures/homedecor_dvdvcr_inv.png b/homedecor_electronics/textures/homedecor_dvdvcr_inv.png
index 025b585..025b585 100644
--- a/homedecor/textures/homedecor_dvdvcr_inv.png
+++ b/homedecor_electronics/textures/homedecor_dvdvcr_inv.png
diff --git a/homedecor/textures/homedecor_dvdvcr_sides.png b/homedecor_electronics/textures/homedecor_dvdvcr_sides.png
index 19983fb..19983fb 100644
--- a/homedecor/textures/homedecor_dvdvcr_sides.png
+++ b/homedecor_electronics/textures/homedecor_dvdvcr_sides.png
diff --git a/homedecor/textures/homedecor_dvdvcr_top.png b/homedecor_electronics/textures/homedecor_dvdvcr_top.png
index 983ad37..983ad37 100644
--- a/homedecor/textures/homedecor_dvdvcr_top.png
+++ b/homedecor_electronics/textures/homedecor_dvdvcr_top.png
diff --git a/homedecor/textures/homedecor_projection_screen.png b/homedecor_electronics/textures/homedecor_projection_screen.png
index 1c87c00..1c87c00 100644
--- a/homedecor/textures/homedecor_projection_screen.png
+++ b/homedecor_electronics/textures/homedecor_projection_screen.png
diff --git a/homedecor/textures/homedecor_projection_screen_inv.png b/homedecor_electronics/textures/homedecor_projection_screen_inv.png
index bc62699..bc62699 100644
--- a/homedecor/textures/homedecor_projection_screen_inv.png
+++ b/homedecor_electronics/textures/homedecor_projection_screen_inv.png
diff --git a/homedecor/textures/homedecor_speaker_driver.png b/homedecor_electronics/textures/homedecor_speaker_driver.png
index d41f217..d41f217 100644
--- a/homedecor/textures/homedecor_speaker_driver.png
+++ b/homedecor_electronics/textures/homedecor_speaker_driver.png
diff --git a/homedecor/textures/homedecor_speaker_driver_inv.png b/homedecor_electronics/textures/homedecor_speaker_driver_inv.png
index 729c1d6..729c1d6 100644
--- a/homedecor/textures/homedecor_speaker_driver_inv.png
+++ b/homedecor_electronics/textures/homedecor_speaker_driver_inv.png
diff --git a/homedecor/textures/homedecor_speaker_front.png b/homedecor_electronics/textures/homedecor_speaker_front.png
index a2e53e0..a2e53e0 100644
--- a/homedecor/textures/homedecor_speaker_front.png
+++ b/homedecor_electronics/textures/homedecor_speaker_front.png
diff --git a/homedecor/textures/homedecor_speaker_open_front.png b/homedecor_electronics/textures/homedecor_speaker_open_front.png
index c02286a..c02286a 100644
--- a/homedecor/textures/homedecor_speaker_open_front.png
+++ b/homedecor_electronics/textures/homedecor_speaker_open_front.png
diff --git a/homedecor/textures/homedecor_speaker_sides.png b/homedecor_electronics/textures/homedecor_speaker_sides.png
index 67b586e..67b586e 100644
--- a/homedecor/textures/homedecor_speaker_sides.png
+++ b/homedecor_electronics/textures/homedecor_speaker_sides.png
diff --git a/homedecor/textures/homedecor_stereo_back.png b/homedecor_electronics/textures/homedecor_stereo_back.png
index 319e88d..319e88d 100644
--- a/homedecor/textures/homedecor_stereo_back.png
+++ b/homedecor_electronics/textures/homedecor_stereo_back.png
diff --git a/homedecor/textures/homedecor_stereo_bottom.png b/homedecor_electronics/textures/homedecor_stereo_bottom.png
index c52580e..c52580e 100644
--- a/homedecor/textures/homedecor_stereo_bottom.png
+++ b/homedecor_electronics/textures/homedecor_stereo_bottom.png
diff --git a/homedecor/textures/homedecor_stereo_front.png b/homedecor_electronics/textures/homedecor_stereo_front.png
index 1ba3b99..1ba3b99 100644
--- a/homedecor/textures/homedecor_stereo_front.png
+++ b/homedecor_electronics/textures/homedecor_stereo_front.png
diff --git a/homedecor/textures/homedecor_stereo_left.png b/homedecor_electronics/textures/homedecor_stereo_left.png
index 857f16a..857f16a 100644
--- a/homedecor/textures/homedecor_stereo_left.png
+++ b/homedecor_electronics/textures/homedecor_stereo_left.png
diff --git a/homedecor/textures/homedecor_stereo_top.png b/homedecor_electronics/textures/homedecor_stereo_top.png
index 90b908d..90b908d 100644
--- a/homedecor/textures/homedecor_stereo_top.png
+++ b/homedecor_electronics/textures/homedecor_stereo_top.png
diff --git a/homedecor/textures/homedecor_telephone_base.png b/homedecor_electronics/textures/homedecor_telephone_base.png
index 50bc8ae..50bc8ae 100644
--- a/homedecor/textures/homedecor_telephone_base.png
+++ b/homedecor_electronics/textures/homedecor_telephone_base.png
diff --git a/homedecor/textures/homedecor_telephone_cord.png b/homedecor_electronics/textures/homedecor_telephone_cord.png
index 7a089ed..7a089ed 100644
--- a/homedecor/textures/homedecor_telephone_cord.png
+++ b/homedecor_electronics/textures/homedecor_telephone_cord.png
diff --git a/homedecor/textures/homedecor_telephone_dial.png b/homedecor_electronics/textures/homedecor_telephone_dial.png
index 7189601..7189601 100644
--- a/homedecor/textures/homedecor_telephone_dial.png
+++ b/homedecor_electronics/textures/homedecor_telephone_dial.png
diff --git a/homedecor/textures/homedecor_telephone_handset.png b/homedecor_electronics/textures/homedecor_telephone_handset.png
index 1c5c0d8..1c5c0d8 100644
--- a/homedecor/textures/homedecor_telephone_handset.png
+++ b/homedecor_electronics/textures/homedecor_telephone_handset.png
diff --git a/homedecor/textures/homedecor_telephone_inv.png b/homedecor_electronics/textures/homedecor_telephone_inv.png
index 793533a..793533a 100644
--- a/homedecor/textures/homedecor_telephone_inv.png
+++ b/homedecor_electronics/textures/homedecor_telephone_inv.png
diff --git a/homedecor/textures/homedecor_television_back.png b/homedecor_electronics/textures/homedecor_television_back.png
index 33bb786..33bb786 100644
--- a/homedecor/textures/homedecor_television_back.png
+++ b/homedecor_electronics/textures/homedecor_television_back.png
diff --git a/homedecor/textures/homedecor_television_bottom.png b/homedecor_electronics/textures/homedecor_television_bottom.png
index 1e9c9fe..1e9c9fe 100644
--- a/homedecor/textures/homedecor_television_bottom.png
+++ b/homedecor_electronics/textures/homedecor_television_bottom.png
diff --git a/homedecor/textures/homedecor_television_front.png b/homedecor_electronics/textures/homedecor_television_front.png
index c8d76e7..c8d76e7 100644
--- a/homedecor/textures/homedecor_television_front.png
+++ b/homedecor_electronics/textures/homedecor_television_front.png
diff --git a/homedecor/textures/homedecor_television_front_animated.png b/homedecor_electronics/textures/homedecor_television_front_animated.png
index 4599427..4599427 100644
--- a/homedecor/textures/homedecor_television_front_animated.png
+++ b/homedecor_electronics/textures/homedecor_television_front_animated.png
diff --git a/homedecor/textures/homedecor_television_left.png b/homedecor_electronics/textures/homedecor_television_left.png
index 03bdfd6..03bdfd6 100644
--- a/homedecor/textures/homedecor_television_left.png
+++ b/homedecor_electronics/textures/homedecor_television_left.png
diff --git a/homedecor/textures/homedecor_television_top.png b/homedecor_electronics/textures/homedecor_television_top.png
index 4c01844..4c01844 100644
--- a/homedecor/textures/homedecor_television_top.png
+++ b/homedecor_electronics/textures/homedecor_television_top.png
diff --git a/homedecor/textures/homedecor_vcr.png b/homedecor_electronics/textures/homedecor_vcr.png
index 964464b..964464b 100644
--- a/homedecor/textures/homedecor_vcr.png
+++ b/homedecor_electronics/textures/homedecor_vcr.png
diff --git a/homedecor_exterior/depends.txt b/homedecor_exterior/depends.txt
new file mode 100644
index 0000000..4f9910b
--- /dev/null
+++ b/homedecor_exterior/depends.txt
@@ -0,0 +1,7 @@
+homedecor_common
+default
+dye
+creative
+moreblocks?
+building_blocks?
+bucket?
diff --git a/homedecor/exterior.lua b/homedecor_exterior/init.lua
index a4e0fda..efe3883 100644
--- a/homedecor/exterior.lua
+++ b/homedecor_exterior/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local function N_(x) return x end
 
@@ -367,7 +367,7 @@ homedecor.shrub_colors = {
 local shrub_cbox = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
 
 for _, color in ipairs(homedecor.shrub_colors) do
-	minetest.register_node("homedecor:shrubbery_large_"..color, {
+	minetest.register_node(":homedecor:shrubbery_large_"..color, {
 		description = S("Shrubbery (large, @1)", S(color)),
 		drawtype = "mesh",
 		mesh = "homedecor_cube.obj",
@@ -378,7 +378,7 @@ for _, color in ipairs(homedecor.shrub_colors) do
 		sounds = default.node_sound_leaves_defaults(),
 	})
 
-	minetest.register_node("homedecor:shrubbery_"..color, {
+	minetest.register_node(":homedecor:shrubbery_"..color, {
 		description = S("Shrubbery (@1)", S(color)),
 		drawtype = "mesh",
 		mesh = "homedecor_shrubbery.obj",
@@ -396,6 +396,252 @@ for _, color in ipairs(homedecor.shrub_colors) do
 	})
 end
 
+-- crafting
+
+minetest.register_craft({
+        output = "homedecor:chimney 2",
+        recipe = {
+			{ "default:clay_brick", "", "default:clay_brick" },
+			{ "default:clay_brick", "", "default:clay_brick" },
+			{ "default:clay_brick", "", "default:clay_brick" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:doghouse",
+        recipe = {
+			{"homedecor:shingles_terracotta", "homedecor:shingles_terracotta", "homedecor:shingles_terracotta"},
+			{"group:wood", "", "group:wood"},
+			{"group:wood", "building_blocks:terrycloth_towel", "group:wood"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:well",
+        recipe = {
+			{ "homedecor:shingles_wood", "homedecor:shingles_wood", "homedecor:shingles_wood" },
+			{ "group:wood", "group:stick", "group:wood" },
+			{ "group:stone", "", "group:stone" }
+        },
+})
+
+
+
+minetest.register_craft( {
+        output = "homedecor:bench_large_1",
+        recipe = {
+			{ "group:wood", "group:wood", "group:wood" },
+			{ "group:wood", "group:wood", "group:wood" },
+			{ "homedecor:pole_wrought_iron", "", "homedecor:pole_wrought_iron" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:bench_large_2_left",
+        recipe = {
+			{ "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" },
+			{ "group:wood", "group:wood", "group:wood" },
+			{ "stairs:slab_wood", "", "stairs:slab_wood" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:bench_large_2_left",
+        recipe = {
+			{ "homedecor:shutter_oak", "homedecor:shutter_oak", "homedecor:shutter_oak" },
+			{ "group:wood", "group:wood", "group:wood" },
+			{ "moreblocks:slab_wood", "", "moreblocks:slab_wood" }
+        },
+})
+
+
+minetest.register_craft( {
+        output = "homedecor:simple_bench",
+        recipe = {
+			{ "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" },
+			{ "stairs:slab_wood", "", "stairs:slab_wood" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:simple_bench",
+        recipe = {
+			{ "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" },
+			{ "moreblocks:slab_wood", "", "moreblocks:slab_wood" }
+        },
+})
+
+
+minetest.register_craft({
+	output = "homedecor:deckchair",
+	recipe = {
+		{ "group:stick", "building_blocks:terrycloth_towel", "group:stick" },
+		{ "group:stick", "building_blocks:terrycloth_towel", "group:stick" },
+		{ "group:stick", "building_blocks:terrycloth_towel", "group:stick" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:deckchair_striped_blue",
+	type = "shapeless",
+	recipe = {
+		"homedecor:deckchair",
+		"dye:blue"
+	}
+})
+
+
+minetest.register_craft({
+	output = "homedecor:stonepath 16",
+	recipe = {
+		{ "stairs:slab_stone","","stairs:slab_stone" },
+		{ "","stairs:slab_stone","" },
+		{ "stairs:slab_stone","","stairs:slab_stone" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:stonepath 16",
+	recipe = {
+		{ "moreblocks:slab_stone","","moreblocks:slab_stone" },
+		{ "","moreblocks:slab_stone","" },
+		{ "moreblocks:slab_stone","","moreblocks:slab_stone" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:stonepath 3",
+	recipe = {
+		{ "moreblocks:micro_stone_1","","moreblocks:micro_stone_1" },
+		{ "","moreblocks:micro_stone_1","" },
+		{ "moreblocks:micro_stone_1","","moreblocks:micro_stone_1" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:barbecue",
+	recipe = {
+		{ "","homedecor:fence_chainlink","" },
+		{ "default:steel_ingot","fake_fire:embers","default:steel_ingot" },
+		{ "homedecor:pole_wrought_iron","default:steel_ingot","homedecor:pole_wrought_iron" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:swing",
+	recipe = {
+		{ "farming:string","","farming:string" },
+		{ "farming:string","","farming:string" },
+		{ "farming:string","stairs:slab_wood","farming:string" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:swing",
+	recipe = {
+		{ "farming:string","","farming:string" },
+		{ "farming:string","","farming:string" },
+		{ "farming:string","moreblocks:slab_wood","farming:string" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:swing",
+	recipe = {
+		{ "farming:string","","farming:string" },
+		{ "farming:string","","farming:string" },
+		{ "farming:string","moreblocks:panel_wood_1","farming:string" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:lattice_wood 8",
+	recipe = {
+		{"group:stick", "group:wood", "group:stick"},
+		{"group:wood", "", "group:wood"},
+		{"group:stick", "group:wood", "group:stick"},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:lattice_white_wood 8",
+	recipe = {
+		{"group:stick", "group:wood", "group:stick"},
+		{"group:wood", "dye:white", "group:wood"},
+		{"group:stick", "group:wood", "group:stick"},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:lattice_wood_vegetal 8",
+	recipe = {
+		{"group:stick", "group:wood", "group:stick"},
+		{"group:wood", "group:leaves", "group:wood"},
+		{"group:stick", "group:wood", "group:stick"},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:lattice_white_wood_vegetal 8",
+	recipe = {
+		{"group:stick", "group:wood", "group:stick"},
+		{"group:wood", "group:leaves", "group:wood"},
+		{"group:stick", "dye:white", "group:stick"},
+	},
+})
+
+
+minetest.register_craft({
+	output = "homedecor:shrubbery_green 3",
+	recipe = {
+		{ "group:leaves", "group:leaves", "group:leaves" },
+		{ "group:leaves", "group:leaves", "group:leaves" },
+		{ "group:stick", "group:stick", "group:stick" }
+	}
+})
+
+for _, color in ipairs(homedecor.shrub_colors) do
+
+	minetest.register_craft({
+		type = "shapeless",
+		output = "homedecor:shrubbery_large_"..color,
+		recipe = {
+			"homedecor:shrubbery_"..color
+		}
+	})
+
+	minetest.register_craft({
+		type = "shapeless",
+		output = "homedecor:shrubbery_"..color,
+		recipe = {
+			"homedecor:shrubbery_large_"..color
+		}
+	})
+
+	if color ~= "green" then
+		minetest.register_craft({
+			type = "shapeless",
+			output = "homedecor:shrubbery_large_"..color,
+			recipe = {
+				"homedecor:shrubbery_large_green",
+				"dye:"..color
+			}
+		})
+
+		minetest.register_craft({
+			type = "shapeless",
+			output = "homedecor:shrubbery_"..color,
+			recipe = {
+				"homedecor:shrubbery_green",
+				"dye:"..color
+			}
+		})
+
+	end
+end
+
+-- aliases
+
 minetest.register_alias("homedecor:well_top", "air")
 minetest.register_alias("homedecor:well_base", "homedecor:well")
 
diff --git a/homedecor/models/homedecor_barbecue.obj b/homedecor_exterior/models/homedecor_barbecue.obj
index 6a646be..6a646be 100644
--- a/homedecor/models/homedecor_barbecue.obj
+++ b/homedecor_exterior/models/homedecor_barbecue.obj
diff --git a/homedecor/models/homedecor_bench_large_1.obj b/homedecor_exterior/models/homedecor_bench_large_1.obj
index a5719c9..a5719c9 100644
--- a/homedecor/models/homedecor_bench_large_1.obj
+++ b/homedecor_exterior/models/homedecor_bench_large_1.obj
diff --git a/homedecor/models/homedecor_bench_large_2.obj b/homedecor_exterior/models/homedecor_bench_large_2.obj
index 505f167..505f167 100644
--- a/homedecor/models/homedecor_bench_large_2.obj
+++ b/homedecor_exterior/models/homedecor_bench_large_2.obj
diff --git a/homedecor/models/homedecor_chimney.obj b/homedecor_exterior/models/homedecor_chimney.obj
index a73de3b..a73de3b 100644
--- a/homedecor/models/homedecor_chimney.obj
+++ b/homedecor_exterior/models/homedecor_chimney.obj
diff --git a/homedecor/models/homedecor_deckchair.obj b/homedecor_exterior/models/homedecor_deckchair.obj
index e5f8d03..e5f8d03 100644
--- a/homedecor/models/homedecor_deckchair.obj
+++ b/homedecor_exterior/models/homedecor_deckchair.obj
diff --git a/homedecor/models/homedecor_doghouse.obj b/homedecor_exterior/models/homedecor_doghouse.obj
index 92cb387..92cb387 100644
--- a/homedecor/models/homedecor_doghouse.obj
+++ b/homedecor_exterior/models/homedecor_doghouse.obj
diff --git a/homedecor/models/homedecor_shrubbery.obj b/homedecor_exterior/models/homedecor_shrubbery.obj
index c4e6c8a..c4e6c8a 100644
--- a/homedecor/models/homedecor_shrubbery.obj
+++ b/homedecor_exterior/models/homedecor_shrubbery.obj
diff --git a/homedecor/models/homedecor_well.obj b/homedecor_exterior/models/homedecor_well.obj
index beb3a1d..beb3a1d 100644
--- a/homedecor/models/homedecor_well.obj
+++ b/homedecor_exterior/models/homedecor_well.obj
diff --git a/homedecor/textures/homedecor_barbecue_meat.png b/homedecor_exterior/textures/homedecor_barbecue_meat.png
index 6179462..6179462 100644
--- a/homedecor/textures/homedecor_barbecue_meat.png
+++ b/homedecor_exterior/textures/homedecor_barbecue_meat.png
diff --git a/homedecor/textures/homedecor_bench_large_1_inv.png b/homedecor_exterior/textures/homedecor_bench_large_1_inv.png
index b9eb36c..b9eb36c 100644
--- a/homedecor/textures/homedecor_bench_large_1_inv.png
+++ b/homedecor_exterior/textures/homedecor_bench_large_1_inv.png
diff --git a/homedecor/textures/homedecor_bench_large_2_inv.png b/homedecor_exterior/textures/homedecor_bench_large_2_inv.png
index 961be62..961be62 100644
--- a/homedecor/textures/homedecor_bench_large_2_inv.png
+++ b/homedecor_exterior/textures/homedecor_bench_large_2_inv.png
diff --git a/homedecor/textures/homedecor_chimney_tb.png b/homedecor_exterior/textures/homedecor_chimney_tb.png
index 80161e6..80161e6 100644
--- a/homedecor/textures/homedecor_chimney_tb.png
+++ b/homedecor_exterior/textures/homedecor_chimney_tb.png
diff --git a/homedecor/textures/homedecor_deckchair.png b/homedecor_exterior/textures/homedecor_deckchair.png
index 47b7752..47b7752 100644
--- a/homedecor/textures/homedecor_deckchair.png
+++ b/homedecor_exterior/textures/homedecor_deckchair.png
diff --git a/homedecor/textures/homedecor_deckchair_striped_blue.png b/homedecor_exterior/textures/homedecor_deckchair_striped_blue.png
index ac24eda..ac24eda 100644
--- a/homedecor/textures/homedecor_deckchair_striped_blue.png
+++ b/homedecor_exterior/textures/homedecor_deckchair_striped_blue.png
diff --git a/homedecor/textures/homedecor_doghouse_inv.png b/homedecor_exterior/textures/homedecor_doghouse_inv.png
index 81d2a73..81d2a73 100644
--- a/homedecor/textures/homedecor_doghouse_inv.png
+++ b/homedecor_exterior/textures/homedecor_doghouse_inv.png
diff --git a/homedecor/textures/homedecor_embers.png b/homedecor_exterior/textures/homedecor_embers.png
index 2e7dda5..2e7dda5 100644
--- a/homedecor/textures/homedecor_embers.png
+++ b/homedecor_exterior/textures/homedecor_embers.png
diff --git a/homedecor/textures/homedecor_lattice.png b/homedecor_exterior/textures/homedecor_lattice.png
index dacc251..dacc251 100644
--- a/homedecor/textures/homedecor_lattice.png
+++ b/homedecor_exterior/textures/homedecor_lattice.png
diff --git a/homedecor/textures/homedecor_lattice_vegetal.png b/homedecor_exterior/textures/homedecor_lattice_vegetal.png
index b188ec6..b188ec6 100644
--- a/homedecor/textures/homedecor_lattice_vegetal.png
+++ b/homedecor_exterior/textures/homedecor_lattice_vegetal.png
diff --git a/homedecor/textures/homedecor_rope_texture.png b/homedecor_exterior/textures/homedecor_rope_texture.png
index ee4d9d2..ee4d9d2 100644
--- a/homedecor/textures/homedecor_rope_texture.png
+++ b/homedecor_exterior/textures/homedecor_rope_texture.png
diff --git a/homedecor/textures/homedecor_shrubbery_green.png b/homedecor_exterior/textures/homedecor_shrubbery_green.png
index 7434857..7434857 100644
--- a/homedecor/textures/homedecor_shrubbery_green.png
+++ b/homedecor_exterior/textures/homedecor_shrubbery_green.png
diff --git a/homedecor/textures/homedecor_shrubbery_green_bottom.png b/homedecor_exterior/textures/homedecor_shrubbery_green_bottom.png
index e8c4a13..e8c4a13 100644
--- a/homedecor/textures/homedecor_shrubbery_green_bottom.png
+++ b/homedecor_exterior/textures/homedecor_shrubbery_green_bottom.png
diff --git a/homedecor/textures/homedecor_shrubbery_red.png b/homedecor_exterior/textures/homedecor_shrubbery_red.png
index 76ec3de..76ec3de 100644
--- a/homedecor/textures/homedecor_shrubbery_red.png
+++ b/homedecor_exterior/textures/homedecor_shrubbery_red.png
diff --git a/homedecor/textures/homedecor_shrubbery_red_bottom.png b/homedecor_exterior/textures/homedecor_shrubbery_red_bottom.png
index 1f289fc..1f289fc 100644
--- a/homedecor/textures/homedecor_shrubbery_red_bottom.png
+++ b/homedecor_exterior/textures/homedecor_shrubbery_red_bottom.png
diff --git a/homedecor/textures/homedecor_shrubbery_roots.png b/homedecor_exterior/textures/homedecor_shrubbery_roots.png
index b33659e..b33659e 100644
--- a/homedecor/textures/homedecor_shrubbery_roots.png
+++ b/homedecor_exterior/textures/homedecor_shrubbery_roots.png
diff --git a/homedecor/textures/homedecor_shrubbery_yellow.png b/homedecor_exterior/textures/homedecor_shrubbery_yellow.png
index 1a8a496..1a8a496 100644
--- a/homedecor/textures/homedecor_shrubbery_yellow.png
+++ b/homedecor_exterior/textures/homedecor_shrubbery_yellow.png
diff --git a/homedecor/textures/homedecor_shrubbery_yellow_bottom.png b/homedecor_exterior/textures/homedecor_shrubbery_yellow_bottom.png
index 8fd3010..8fd3010 100644
--- a/homedecor/textures/homedecor_shrubbery_yellow_bottom.png
+++ b/homedecor_exterior/textures/homedecor_shrubbery_yellow_bottom.png
diff --git a/homedecor/textures/homedecor_stonepath_inv.png b/homedecor_exterior/textures/homedecor_stonepath_inv.png
index e5f3123..e5f3123 100644
--- a/homedecor/textures/homedecor_stonepath_inv.png
+++ b/homedecor_exterior/textures/homedecor_stonepath_inv.png
diff --git a/homedecor/textures/homedecor_swing_inv.png b/homedecor_exterior/textures/homedecor_swing_inv.png
index e10cf78..e10cf78 100644
--- a/homedecor/textures/homedecor_swing_inv.png
+++ b/homedecor_exterior/textures/homedecor_swing_inv.png
diff --git a/homedecor/textures/homedecor_swing_top.png b/homedecor_exterior/textures/homedecor_swing_top.png
index 4ef1b24..4ef1b24 100644
--- a/homedecor/textures/homedecor_swing_top.png
+++ b/homedecor_exterior/textures/homedecor_swing_top.png
diff --git a/homedecor/textures/homedecor_swingrope_sides.png b/homedecor_exterior/textures/homedecor_swingrope_sides.png
index 3c1270f..3c1270f 100644
--- a/homedecor/textures/homedecor_swingrope_sides.png
+++ b/homedecor_exterior/textures/homedecor_swingrope_sides.png
diff --git a/homedecor/textures/homedecor_well_inv.png b/homedecor_exterior/textures/homedecor_well_inv.png
index 90c094a..90c094a 100644
--- a/homedecor/textures/homedecor_well_inv.png
+++ b/homedecor_exterior/textures/homedecor_well_inv.png
diff --git a/homedecor_fences/depends.txt b/homedecor_fences/depends.txt
new file mode 100644
index 0000000..8505ec7
--- /dev/null
+++ b/homedecor_fences/depends.txt
@@ -0,0 +1,5 @@
+homedecor_common
+default
+basic_materials
+dye
+signs_lib?
diff --git a/homedecor/fences.lua b/homedecor_fences/init.lua
index 3affefe..94badf6 100644
--- a/homedecor/fences.lua
+++ b/homedecor_fences/init.lua
@@ -14,7 +14,7 @@ if signs_modpath then
 	sign_post_model = signs_lib.sign_post_model.nodebox
 end
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local materials = {
 	{ S("brass"), "brass" },
@@ -307,3 +307,183 @@ if signs_modpath then
 	signs_lib.register_fence_with_sign("homedecor:fence_brass", "homedecor:fence_brass_with_sign")
 	signs_lib.register_fence_with_sign("homedecor:fence_wrought_iron", "homedecor:fence_wrought_iron_with_sign")
 end
+
+-- crafting
+
+-- Brass/wrought iron fences
+
+minetest.register_craft( {
+        output = "homedecor:fence_brass 6",
+	recipe = {
+		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" },
+		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" },
+	},
+})
+
+minetest.register_craft( {
+	output = "homedecor:fence_wrought_iron 6",
+	recipe = {
+		{ "default:iron_lump","default:iron_lump","default:iron_lump" },
+		{ "default:iron_lump","default:iron_lump","default:iron_lump" },
+	},
+})
+
+-- other types of fences
+
+minetest.register_craft( {
+	output = "homedecor:fence_wrought_iron_2 4",
+	recipe = {
+		{ "homedecor:pole_wrought_iron", "default:iron_lump" },
+		{ "homedecor:pole_wrought_iron", "default:iron_lump" },
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_wrought_iron_2_corner",
+	recipe = {
+		"homedecor:fence_wrought_iron_2",
+		"homedecor:fence_wrought_iron_2"
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_wrought_iron_2 2",
+	recipe = {
+		"homedecor:fence_wrought_iron_2_corner",
+	},
+})
+
+--
+
+minetest.register_craft( {
+	output = "homedecor:fence_picket 6",
+	recipe = {
+		{ "group:stick", "group:stick", "group:stick" },
+		{ "group:stick", "", "group:stick" },
+		{ "group:stick", "group:stick", "group:stick" }
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_picket_corner",
+	recipe = {
+		"homedecor:fence_picket",
+		"homedecor:fence_picket"
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_picket 2",
+	recipe = {
+		"homedecor:fence_picket_corner"
+	},
+})
+
+--
+
+
+minetest.register_craft( {
+	output = "homedecor:fence_picket_white 6",
+	recipe = {
+		{ "group:stick", "group:stick", "group:stick" },
+		{ "group:stick", "dye:white", "group:stick" },
+		{ "group:stick", "group:stick", "group:stick" }
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_picket_corner_white",
+	recipe = {
+		"homedecor:fence_picket_white",
+		"homedecor:fence_picket_white"
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_picket_white 2",
+	recipe = {
+		"homedecor:fence_picket_corner_white"
+	},
+})
+
+--
+
+
+minetest.register_craft( {
+	output = "homedecor:fence_privacy 6",
+	recipe = {
+		{ "group:wood", "group:stick", "group:wood" },
+		{ "group:wood", "", "group:wood" },
+		{ "group:wood", "group:stick", "group:wood" }
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_privacy_corner",
+	recipe = {
+		"homedecor:fence_privacy",
+		"homedecor:fence_privacy"
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_privacy 2",
+	recipe = {
+		"homedecor:fence_privacy_corner"
+	},
+})
+
+--
+
+
+minetest.register_craft( {
+	output = "homedecor:fence_barbed_wire 6",
+	recipe = {
+		{ "group:stick", "basic_materials:steel_wire", "group:stick" },
+		{ "group:stick", "", "group:stick" },
+		{ "group:stick", "basic_materials:steel_wire", "group:stick" }
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_barbed_wire_corner",
+	recipe = { "homedecor:fence_barbed_wire", "homedecor:fence_barbed_wire" },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_barbed_wire 2",
+	recipe = { "homedecor:fence_barbed_wire_corner" },
+})
+
+--
+
+minetest.register_craft( {
+	output = "homedecor:fence_chainlink 9",
+	recipe = {
+		{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
+		{ "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" },
+		{ "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" }
+	},
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_chainlink_corner",
+	recipe = { "homedecor:fence_chainlink", "homedecor:fence_chainlink" },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+	output = "homedecor:fence_chainlink 2",
+	recipe = { "homedecor:fence_chainlink_corner" },
+})
diff --git a/homedecor/models/homedecor_fence_barbed_wire.obj b/homedecor_fences/models/homedecor_fence_barbed_wire.obj
index 37fba1e..37fba1e 100644
--- a/homedecor/models/homedecor_fence_barbed_wire.obj
+++ b/homedecor_fences/models/homedecor_fence_barbed_wire.obj
diff --git a/homedecor/models/homedecor_fence_barbed_wire_corner.obj b/homedecor_fences/models/homedecor_fence_barbed_wire_corner.obj
index 3f4a725..3f4a725 100644
--- a/homedecor/models/homedecor_fence_barbed_wire_corner.obj
+++ b/homedecor_fences/models/homedecor_fence_barbed_wire_corner.obj
diff --git a/homedecor/models/homedecor_fence_chainlink.obj b/homedecor_fences/models/homedecor_fence_chainlink.obj
index f700141..f700141 100644
--- a/homedecor/models/homedecor_fence_chainlink.obj
+++ b/homedecor_fences/models/homedecor_fence_chainlink.obj
diff --git a/homedecor/models/homedecor_fence_chainlink_corner.obj b/homedecor_fences/models/homedecor_fence_chainlink_corner.obj
index a210d41..a210d41 100644
--- a/homedecor/models/homedecor_fence_chainlink_corner.obj
+++ b/homedecor_fences/models/homedecor_fence_chainlink_corner.obj
diff --git a/homedecor/textures/homedecor_fence_barbed_wire.png b/homedecor_fences/textures/homedecor_fence_barbed_wire.png
index 1fd22a7..1fd22a7 100644
--- a/homedecor/textures/homedecor_fence_barbed_wire.png
+++ b/homedecor_fences/textures/homedecor_fence_barbed_wire.png
diff --git a/homedecor/textures/homedecor_fence_brass.png b/homedecor_fences/textures/homedecor_fence_brass.png
index bb4bf10..bb4bf10 100644
--- a/homedecor/textures/homedecor_fence_brass.png
+++ b/homedecor_fences/textures/homedecor_fence_brass.png
diff --git a/homedecor/textures/homedecor_fence_chainlink_corner_front.png b/homedecor_fences/textures/homedecor_fence_chainlink_corner_front.png
index 07a48d3..07a48d3 100644
--- a/homedecor/textures/homedecor_fence_chainlink_corner_front.png
+++ b/homedecor_fences/textures/homedecor_fence_chainlink_corner_front.png
diff --git a/homedecor/textures/homedecor_fence_chainlink_corner_top.png b/homedecor_fences/textures/homedecor_fence_chainlink_corner_top.png
index 324109d..324109d 100644
--- a/homedecor/textures/homedecor_fence_chainlink_corner_top.png
+++ b/homedecor_fences/textures/homedecor_fence_chainlink_corner_top.png
diff --git a/homedecor/textures/homedecor_fence_chainlink_fb.png b/homedecor_fences/textures/homedecor_fence_chainlink_fb.png
index 21a09d7..21a09d7 100644
--- a/homedecor/textures/homedecor_fence_chainlink_fb.png
+++ b/homedecor_fences/textures/homedecor_fence_chainlink_fb.png
diff --git a/homedecor/textures/homedecor_fence_chainlink_sides.png b/homedecor_fences/textures/homedecor_fence_chainlink_sides.png
index a120207..a120207 100644
--- a/homedecor/textures/homedecor_fence_chainlink_sides.png
+++ b/homedecor_fences/textures/homedecor_fence_chainlink_sides.png
diff --git a/homedecor/textures/homedecor_fence_chainlink_tb.png b/homedecor_fences/textures/homedecor_fence_chainlink_tb.png
index c1f9cfb..c1f9cfb 100644
--- a/homedecor/textures/homedecor_fence_chainlink_tb.png
+++ b/homedecor_fences/textures/homedecor_fence_chainlink_tb.png
diff --git a/homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png b/homedecor_fences/textures/homedecor_fence_corner_wrought_iron_2_sides.png
index b544fa5..b544fa5 100644
--- a/homedecor/textures/homedecor_fence_corner_wrought_iron_2_sides.png
+++ b/homedecor_fences/textures/homedecor_fence_corner_wrought_iron_2_sides.png
diff --git a/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png b/homedecor_fences/textures/homedecor_fence_corner_wrought_iron_2_tb.png
index d6d6ba2..d6d6ba2 100644
--- a/homedecor/textures/homedecor_fence_corner_wrought_iron_2_tb.png
+++ b/homedecor_fences/textures/homedecor_fence_corner_wrought_iron_2_tb.png
diff --git a/homedecor/textures/homedecor_fence_picket.png b/homedecor_fences/textures/homedecor_fence_picket.png
index 7c98218..7c98218 100644
--- a/homedecor/textures/homedecor_fence_picket.png
+++ b/homedecor_fences/textures/homedecor_fence_picket.png
diff --git a/homedecor/textures/homedecor_fence_picket_backside.png b/homedecor_fences/textures/homedecor_fence_picket_backside.png
index 4bc274c..4bc274c 100644
--- a/homedecor/textures/homedecor_fence_picket_backside.png
+++ b/homedecor_fences/textures/homedecor_fence_picket_backside.png
diff --git a/homedecor/textures/homedecor_fence_picket_white.png b/homedecor_fences/textures/homedecor_fence_picket_white.png
index b1a142e..b1a142e 100644
--- a/homedecor/textures/homedecor_fence_picket_white.png
+++ b/homedecor_fences/textures/homedecor_fence_picket_white.png
diff --git a/homedecor/textures/homedecor_fence_picket_white_backside.png b/homedecor_fences/textures/homedecor_fence_picket_white_backside.png
index 3fb1a9d..3fb1a9d 100644
--- a/homedecor/textures/homedecor_fence_picket_white_backside.png
+++ b/homedecor_fences/textures/homedecor_fence_picket_white_backside.png
diff --git a/homedecor/textures/homedecor_fence_privacy_backside.png b/homedecor_fences/textures/homedecor_fence_privacy_backside.png
index fef1f0c..fef1f0c 100644
--- a/homedecor/textures/homedecor_fence_privacy_backside.png
+++ b/homedecor_fences/textures/homedecor_fence_privacy_backside.png
diff --git a/homedecor/textures/homedecor_fence_privacy_backside2.png b/homedecor_fences/textures/homedecor_fence_privacy_backside2.png
index fef1f0c..fef1f0c 100644
--- a/homedecor/textures/homedecor_fence_privacy_backside2.png
+++ b/homedecor_fences/textures/homedecor_fence_privacy_backside2.png
diff --git a/homedecor/textures/homedecor_fence_privacy_corner_front.png b/homedecor_fences/textures/homedecor_fence_privacy_corner_front.png
index cc34e1b..cc34e1b 100644
--- a/homedecor/textures/homedecor_fence_privacy_corner_front.png
+++ b/homedecor_fences/textures/homedecor_fence_privacy_corner_front.png
diff --git a/homedecor/textures/homedecor_fence_privacy_corner_right.png b/homedecor_fences/textures/homedecor_fence_privacy_corner_right.png
index f1f0e25..f1f0e25 100644
--- a/homedecor/textures/homedecor_fence_privacy_corner_right.png
+++ b/homedecor_fences/textures/homedecor_fence_privacy_corner_right.png
diff --git a/homedecor/textures/homedecor_fence_privacy_corner_tb.png b/homedecor_fences/textures/homedecor_fence_privacy_corner_tb.png
index ff4dd2e..ff4dd2e 100644
--- a/homedecor/textures/homedecor_fence_privacy_corner_tb.png
+++ b/homedecor_fences/textures/homedecor_fence_privacy_corner_tb.png
diff --git a/homedecor/textures/homedecor_fence_privacy_front.png b/homedecor_fences/textures/homedecor_fence_privacy_front.png
index a7a8652..a7a8652 100644
--- a/homedecor/textures/homedecor_fence_privacy_front.png
+++ b/homedecor_fences/textures/homedecor_fence_privacy_front.png
diff --git a/homedecor/textures/homedecor_fence_privacy_sides.png b/homedecor_fences/textures/homedecor_fence_privacy_sides.png
index 9f45299..9f45299 100644
--- a/homedecor/textures/homedecor_fence_privacy_sides.png
+++ b/homedecor_fences/textures/homedecor_fence_privacy_sides.png
diff --git a/homedecor/textures/homedecor_fence_privacy_tb.png b/homedecor_fences/textures/homedecor_fence_privacy_tb.png
index 076dba6..076dba6 100644
--- a/homedecor/textures/homedecor_fence_privacy_tb.png
+++ b/homedecor_fences/textures/homedecor_fence_privacy_tb.png
diff --git a/homedecor/textures/homedecor_fence_wrought_iron.png b/homedecor_fences/textures/homedecor_fence_wrought_iron.png
index b5d37a8..b5d37a8 100644
--- a/homedecor/textures/homedecor_fence_wrought_iron.png
+++ b/homedecor_fences/textures/homedecor_fence_wrought_iron.png
diff --git a/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_fb.png
index f2fd501..f2fd501 100644
--- a/homedecor/textures/homedecor_fence_wrought_iron_2_fb.png
+++ b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_fb.png
diff --git a/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_sides.png
index 4e89163..4e89163 100644
--- a/homedecor/textures/homedecor_fence_wrought_iron_2_sides.png
+++ b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_sides.png
diff --git a/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_tb.png
index 6e36033..6e36033 100644
--- a/homedecor/textures/homedecor_fence_wrought_iron_2_tb.png
+++ b/homedecor_fences/textures/homedecor_fence_wrought_iron_2_tb.png
diff --git a/homedecor/textures/homedecor_sign_brass_post.png b/homedecor_fences/textures/homedecor_sign_brass_post.png
index 02b3cc9..02b3cc9 100644
--- a/homedecor/textures/homedecor_sign_brass_post.png
+++ b/homedecor_fences/textures/homedecor_sign_brass_post.png
diff --git a/homedecor/textures/homedecor_sign_brass_post_back.png b/homedecor_fences/textures/homedecor_sign_brass_post_back.png
index a520018..a520018 100644
--- a/homedecor/textures/homedecor_sign_brass_post_back.png
+++ b/homedecor_fences/textures/homedecor_sign_brass_post_back.png
diff --git a/homedecor/textures/homedecor_sign_brass_post_bottom.png b/homedecor_fences/textures/homedecor_sign_brass_post_bottom.png
index 8281d88..8281d88 100644
--- a/homedecor/textures/homedecor_sign_brass_post_bottom.png
+++ b/homedecor_fences/textures/homedecor_sign_brass_post_bottom.png
diff --git a/homedecor/textures/homedecor_sign_brass_post_front.png b/homedecor_fences/textures/homedecor_sign_brass_post_front.png
index f3c7c6a..f3c7c6a 100644
--- a/homedecor/textures/homedecor_sign_brass_post_front.png
+++ b/homedecor_fences/textures/homedecor_sign_brass_post_front.png
diff --git a/homedecor/textures/homedecor_sign_brass_post_side.png b/homedecor_fences/textures/homedecor_sign_brass_post_side.png
index 05b5c85..05b5c85 100644
--- a/homedecor/textures/homedecor_sign_brass_post_side.png
+++ b/homedecor_fences/textures/homedecor_sign_brass_post_side.png
diff --git a/homedecor/textures/homedecor_sign_brass_post_top.png b/homedecor_fences/textures/homedecor_sign_brass_post_top.png
index ebdb241..ebdb241 100644
--- a/homedecor/textures/homedecor_sign_brass_post_top.png
+++ b/homedecor_fences/textures/homedecor_sign_brass_post_top.png
diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post.png
index 94b2a6b..94b2a6b 100644
--- a/homedecor/textures/homedecor_sign_wrought_iron_post.png
+++ b/homedecor_fences/textures/homedecor_sign_wrought_iron_post.png
diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_back.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_back.png
index a0c6e59..a0c6e59 100644
--- a/homedecor/textures/homedecor_sign_wrought_iron_post_back.png
+++ b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_back.png
diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_bottom.png
index 20fdc2c..20fdc2c 100644
--- a/homedecor/textures/homedecor_sign_wrought_iron_post_bottom.png
+++ b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_bottom.png
diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_front.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_front.png
index 5447134..5447134 100644
--- a/homedecor/textures/homedecor_sign_wrought_iron_post_front.png
+++ b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_front.png
diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_side.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_side.png
index a0a3656..a0a3656 100644
--- a/homedecor/textures/homedecor_sign_wrought_iron_post_side.png
+++ b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_side.png
diff --git a/homedecor/textures/homedecor_sign_wrought_iron_post_top.png b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_top.png
index 0cfcd1d..0cfcd1d 100644
--- a/homedecor/textures/homedecor_sign_wrought_iron_post_top.png
+++ b/homedecor_fences/textures/homedecor_sign_wrought_iron_post_top.png
diff --git a/homedecor_foyer/depends.txt b/homedecor_foyer/depends.txt
new file mode 100644
index 0000000..d0de51e
--- /dev/null
+++ b/homedecor_foyer/depends.txt
@@ -0,0 +1,3 @@
+homedecor_common
+default
+dye
diff --git a/homedecor/foyer.lua b/homedecor_foyer/init.lua
index c6fb401..0b466f3 100644
--- a/homedecor/foyer.lua
+++ b/homedecor_foyer/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 homedecor.register("coatrack_wallmount", {
 	tiles = { homedecor.plain_wood },
@@ -67,3 +67,55 @@ for _, mat in ipairs(mat_colors) do
 		}
 	})
 end
+
+-- crafting
+
+
+minetest.register_craft({
+    output = "homedecor:welcome_mat_grey 2",
+    recipe = {
+		{ "", "dye:black", "" },
+		{ "wool:grey", "wool:grey", "wool:grey" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:welcome_mat_brown 2",
+    recipe = {
+		{ "", "dye:black", "" },
+		{ "wool:brown", "wool:brown", "wool:brown" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:welcome_mat_green 2",
+    recipe = {
+		{ "", "dye:white", "" },
+		{ "wool:dark_green", "wool:dark_green", "wool:dark_green" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:welcome_mat_green 2",
+    recipe = {
+		{ "", "dye:white", "" },
+		{ "dye:black", "dye:black", "dye:black" },
+		{ "wool:green", "wool:green", "wool:green" },
+    },
+})
+
+minetest.register_craft( {
+        output = "homedecor:coat_tree",
+        recipe = {
+			{ "group:stick", "group:stick", "group:stick" },
+			{ "", "group:stick", "" },
+			{ "", "group:wood", "" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:coatrack_wallmount",
+        recipe = {
+			{ "group:stick", "homedecor:curtainrod_wood", "group:stick" },
+        },
+})
diff --git a/homedecor/models/homedecor_coatrack.obj b/homedecor_foyer/models/homedecor_coatrack.obj
index 9ed5ca6..9ed5ca6 100644
--- a/homedecor/models/homedecor_coatrack.obj
+++ b/homedecor_foyer/models/homedecor_coatrack.obj
diff --git a/homedecor/textures/homedecor_coatrack_inv.png b/homedecor_foyer/textures/homedecor_coatrack_inv.png
index 9d4018e..9d4018e 100644
--- a/homedecor/textures/homedecor_coatrack_inv.png
+++ b/homedecor_foyer/textures/homedecor_coatrack_inv.png
diff --git a/homedecor/textures/homedecor_coatrack_wallmount_inv.png b/homedecor_foyer/textures/homedecor_coatrack_wallmount_inv.png
index 8d776a3..8d776a3 100644
--- a/homedecor/textures/homedecor_coatrack_wallmount_inv.png
+++ b/homedecor_foyer/textures/homedecor_coatrack_wallmount_inv.png
diff --git a/homedecor/textures/homedecor_welcome_mat_bottom.png b/homedecor_foyer/textures/homedecor_welcome_mat_bottom.png
index ec37ebb..ec37ebb 100644
--- a/homedecor/textures/homedecor_welcome_mat_bottom.png
+++ b/homedecor_foyer/textures/homedecor_welcome_mat_bottom.png
diff --git a/homedecor/textures/homedecor_welcome_mat_brown.png b/homedecor_foyer/textures/homedecor_welcome_mat_brown.png
index b10ed22..b10ed22 100644
--- a/homedecor/textures/homedecor_welcome_mat_brown.png
+++ b/homedecor_foyer/textures/homedecor_welcome_mat_brown.png
diff --git a/homedecor/textures/homedecor_welcome_mat_green.png b/homedecor_foyer/textures/homedecor_welcome_mat_green.png
index c58ac96..c58ac96 100644
--- a/homedecor/textures/homedecor_welcome_mat_green.png
+++ b/homedecor_foyer/textures/homedecor_welcome_mat_green.png
diff --git a/homedecor/textures/homedecor_welcome_mat_grey.png b/homedecor_foyer/textures/homedecor_welcome_mat_grey.png
index 8fa9dd2..8fa9dd2 100644
--- a/homedecor/textures/homedecor_welcome_mat_grey.png
+++ b/homedecor_foyer/textures/homedecor_welcome_mat_grey.png
diff --git a/homedecor_furniture/depends.txt b/homedecor_furniture/depends.txt
new file mode 100644
index 0000000..016b9c4
--- /dev/null
+++ b/homedecor_furniture/depends.txt
@@ -0,0 +1,7 @@
+homedecor_common
+default
+unifieddyes
+wool
+moreblocks?
+technic?
+bucket?
diff --git a/homedecor/furniture.lua b/homedecor_furniture/init.lua
index 4acfa58..108f28d 100644
--- a/homedecor/furniture.lua
+++ b/homedecor_furniture/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local table_colors = {
 	{ "",           S("Table"),           homedecor.plain_wood },
@@ -34,15 +34,7 @@ end
 
 local kc_cbox = {
 	type = "fixed",
-	fixed = { -0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125 },
-}
-
-local ac_cbox = {
-	type = "fixed",
-	fixed = {
-		{-0.5, -0.5, -0.5, 0.5, 0, 0.5 },
-		{-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 }
-	}
+	fixed = { -0.3125, -0.3125, -0.5, 0.3125, 0.3125, 0.5 },
 }
 
 homedecor.register("kitchen_chair_wood", {
@@ -92,6 +84,14 @@ homedecor.register("kitchen_chair_padded", {
 	end
 })
 
+local ac_cbox = {
+	type = "fixed",
+	fixed = {
+		{-0.5, -0.5, -0.5, 0.5, 0, 0.5 },
+		{-0.5, -0.5, 0.4, 0.5, 0.5, 0.5 }
+	}
+}
+
 homedecor.register("armchair", {
 	description = S("Armchair"),
 	mesh = "forniture_armchair.obj",
@@ -136,7 +136,7 @@ minetest.register_node(":homedecor:openframe_bookshelf", {
 homedecor.register("wall_shelf", {
 	description = S("Wall Shelf"),
 	tiles = {
-		"homedecor_wood_table_large_edges.png",
+		"default_wood.png",
 	},
 	groups = { snappy = 3 },
 	sounds = default.node_sound_wood_defaults(),
@@ -149,6 +149,289 @@ homedecor.register("wall_shelf", {
 	}
 })
 
+-- Crafts
+
+
+minetest.register_craft({
+	output = "homedecor:table",
+	recipe = {
+		{ "default:wood","default:wood", "default:wood" },
+		{ "group:stick", "", "group:stick" },
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:table_mahogany",
+	recipe = {
+		"homedecor:table",
+		"dye:brown",
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:table_mahogany",
+	recipe = {
+		"homedecor:table",
+		"unifieddyes:dark_orange",
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:table_white",
+	recipe = {
+		"homedecor:table",
+		"dye:white",
+	},
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:table",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:table_mahogany",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:table_white",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	output = "homedecor:kitchen_chair_wood 2",
+	recipe = {
+		{ "group:stick",""},
+		{ "group:wood","group:wood" },
+		{ "group:stick","group:stick" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:armchair 2",
+	recipe = {
+	{ "wool:white",""},
+	{ "group:wood","group:wood" },
+	{ "wool:white","wool:white" },
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:armchair",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:armchair",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:kitchen_chair_padded",
+	recipe = {
+		"homedecor:kitchen_chair_wood",
+		"wool:white",
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:kitchen_chair_padded",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:kitchen_chair_padded",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:kitchen_chair_wood",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:kitchen_chair_padded",
+	burntime = 15,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:armchair",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	output = "homedecor:standing_lamp_off",
+	recipe = {
+		{"homedecor:table_lamp_off"},
+		{"group:stick"},
+		{"group:stick"},
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:standing_lamp_off",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:standing_lamp_off",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:table_lamp_off",
+	burntime = 10,
+})
+
+minetest.register_craft({
+	output = "homedecor:table_lamp_off",
+	recipe = {
+		{ "wool:white", "default:torch", "wool:white"},
+		{ "", "group:stick", ""},
+		{ "", "stairs:slab_wood", "" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:table_lamp_off",
+	recipe = {
+		{ "cottages:wool", "default:torch", "cottages:wool"},
+		{ "", "group:stick", ""},
+		{ "", "stairs:slab_wood", "" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:table_lamp_off",
+	recipe = {
+		{ "wool:white", "default:torch", "wool:white"},
+		{ "", "group:stick", ""},
+		{ "", "moreblocks:slab_wood", "" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:table_lamp_off",
+	recipe = {
+		{ "cottages:wool", "default:torch", "cottages:wool"},
+		{ "", "group:stick", ""},
+		{ "", "moreblocks:slab_wood", "" },
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:table_lamp_off",
+	palette = "extended",
+	type = "shapeless",
+	neutral_node = "homedecor:table_lamp_off",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:toilet",
+	recipe = {
+		{ "","","bucket:bucket_water"},
+		{ "group:marble","group:marble", "group:marble" },
+		{ "", "bucket:bucket_empty", "" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:sink",
+	recipe = {
+		{ "group:marble","bucket:bucket_empty", "group:marble" },
+		{ "", "group:marble", "" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:taps",
+	recipe = {
+		{ "default:steel_ingot","bucket:bucket_water", "default:steel_ingot" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:taps_brass",
+	recipe = {
+		{ "technic:brass_ingot","bucket:bucket_water", "technic:brass_ingot" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:shower_tray",
+	recipe = {
+		{ "group:marble","bucket:bucket_empty", "group:marble" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:shower_head",
+	recipe = {
+		{"default:steel_ingot", "bucket:bucket_water"},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:bathtub_clawfoot_brass_taps",
+	recipe = {
+		{ "homedecor:taps_brass", "", "" },
+		{ "group:marble", "", "group:marble" },
+		{"default:steel_ingot", "group:marble", "default:steel_ingot"},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:bathtub_clawfoot_chrome_taps",
+	recipe = {
+		{ "homedecor:taps", "", "" },
+		{ "group:marble", "", "group:marble" },
+		{"default:steel_ingot", "group:marble", "default:steel_ingot"},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:bars 6",
+	recipe = {
+		{ "default:steel_ingot","default:steel_ingot","default:steel_ingot" },
+		{ "homedecor:pole_wrought_iron","homedecor:pole_wrought_iron","homedecor:pole_wrought_iron" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:L_binding_bars 3",
+	recipe = {
+		{ "homedecor:bars","" },
+		{ "homedecor:bars","homedecor:bars" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:torch_wall 10",
+	recipe = {
+		{ "default:coal_lump" },
+		{ "default:steel_ingot" },
+	},
+})
+
 -- Aliases for 3dforniture mod.
 
 minetest.register_alias("3dforniture:table", "homedecor:table")
@@ -189,7 +472,7 @@ end
 table.insert(homedecor.old_static_chairs, "homedecor:chair")
 
 minetest.register_lbm({
-	name = "homedecor:convert_chairs",
+	name = ":homedecor:convert_chairs",
 	label = "Convert homedecor chairs to use param2 color",
 	run_at_every_load = false,
 	nodenames = homedecor.old_static_chairs,
diff --git a/homedecor/models/forniture_armchair.obj b/homedecor_furniture/models/forniture_armchair.obj
index b563691..b563691 100644
--- a/homedecor/models/forniture_armchair.obj
+++ b/homedecor_furniture/models/forniture_armchair.obj
diff --git a/homedecor/models/homedecor_kitchen_chair.obj b/homedecor_furniture/models/homedecor_kitchen_chair.obj
index 52bd58b..52bd58b 100644
--- a/homedecor/models/homedecor_kitchen_chair.obj
+++ b/homedecor_furniture/models/homedecor_kitchen_chair.obj
diff --git a/homedecor/models/homedecor_openframe_bookshelf.obj b/homedecor_furniture/models/homedecor_openframe_bookshelf.obj
index b3125bc..b3125bc 100644
--- a/homedecor/models/homedecor_openframe_bookshelf.obj
+++ b/homedecor_furniture/models/homedecor_openframe_bookshelf.obj
diff --git a/homedecor/textures/homedecor_armchair_inv.png b/homedecor_furniture/textures/homedecor_armchair_inv.png
index 41eb85d..41eb85d 100644
--- a/homedecor/textures/homedecor_armchair_inv.png
+++ b/homedecor_furniture/textures/homedecor_armchair_inv.png
diff --git a/homedecor/textures/homedecor_chair_padded_inv.png b/homedecor_furniture/textures/homedecor_chair_padded_inv.png
index 1d59dd5..1d59dd5 100644
--- a/homedecor/textures/homedecor_chair_padded_inv.png
+++ b/homedecor_furniture/textures/homedecor_chair_padded_inv.png
diff --git a/homedecor/textures/homedecor_chair_wood_inv.png b/homedecor_furniture/textures/homedecor_chair_wood_inv.png
index 12c216a..12c216a 100644
--- a/homedecor/textures/homedecor_chair_wood_inv.png
+++ b/homedecor_furniture/textures/homedecor_chair_wood_inv.png
diff --git a/homedecor/textures/homedecor_openframe_bookshelf_books.png b/homedecor_furniture/textures/homedecor_openframe_bookshelf_books.png
index ab677ab..ab677ab 100644
--- a/homedecor/textures/homedecor_openframe_bookshelf_books.png
+++ b/homedecor_furniture/textures/homedecor_openframe_bookshelf_books.png
diff --git a/homedecor_furniture_medieval/depends.txt b/homedecor_furniture_medieval/depends.txt
new file mode 100644
index 0000000..dccb7bc
--- /dev/null
+++ b/homedecor_furniture_medieval/depends.txt
@@ -0,0 +1,3 @@
+homedecor_common
+default
+creative
diff --git a/homedecor/furniture_medieval.lua b/homedecor_furniture_medieval/init.lua
index e0932a4..9fb9a9e 100644
--- a/homedecor/furniture_medieval.lua
+++ b/homedecor_furniture_medieval/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 homedecor.register("bars", {
 	description = S("Bars"),
diff --git a/homedecor/models/forniture_chains.obj b/homedecor_furniture_medieval/models/forniture_chains.obj
index dc9e551..dc9e551 100644
--- a/homedecor/models/forniture_chains.obj
+++ b/homedecor_furniture_medieval/models/forniture_chains.obj
diff --git a/homedecor/models/forniture_torch.obj b/homedecor_furniture_medieval/models/forniture_torch.obj
index c97e085..c97e085 100644
--- a/homedecor/models/forniture_torch.obj
+++ b/homedecor_furniture_medieval/models/forniture_torch.obj
diff --git a/homedecor/models/homedecor_wall_lamp.obj b/homedecor_furniture_medieval/models/homedecor_wall_lamp.obj
index 58965c0..58965c0 100644
--- a/homedecor/models/homedecor_wall_lamp.obj
+++ b/homedecor_furniture_medieval/models/homedecor_wall_lamp.obj
diff --git a/homedecor/textures/forniture_chains_inv.png b/homedecor_furniture_medieval/textures/forniture_chains_inv.png
index 4fd4900..4fd4900 100644
--- a/homedecor/textures/forniture_chains_inv.png
+++ b/homedecor_furniture_medieval/textures/forniture_chains_inv.png
diff --git a/homedecor/textures/forniture_coal.png b/homedecor_furniture_medieval/textures/forniture_coal.png
index 7da54a0..7da54a0 100644
--- a/homedecor/textures/forniture_coal.png
+++ b/homedecor_furniture_medieval/textures/forniture_coal.png
diff --git a/homedecor/textures/forniture_marble_top_toilet.png b/homedecor_furniture_medieval/textures/forniture_marble_top_toilet.png
index 0a8d19c..0a8d19c 100644
--- a/homedecor/textures/forniture_marble_top_toilet.png
+++ b/homedecor_furniture_medieval/textures/forniture_marble_top_toilet.png
diff --git a/homedecor/textures/forniture_torch_flame.png b/homedecor_furniture_medieval/textures/forniture_torch_flame.png
index b280b00..b280b00 100644
--- a/homedecor/textures/forniture_torch_flame.png
+++ b/homedecor_furniture_medieval/textures/forniture_torch_flame.png
diff --git a/homedecor/textures/forniture_torch_inv.png b/homedecor_furniture_medieval/textures/forniture_torch_inv.png
index a648b54..a648b54 100644
--- a/homedecor/textures/forniture_torch_inv.png
+++ b/homedecor_furniture_medieval/textures/forniture_torch_inv.png
diff --git a/homedecor/textures/homedecor_wall_lamp_inv.png b/homedecor_furniture_medieval/textures/homedecor_wall_lamp_inv.png
index 12a3d42..12a3d42 100644
--- a/homedecor/textures/homedecor_wall_lamp_inv.png
+++ b/homedecor_furniture_medieval/textures/homedecor_wall_lamp_inv.png
diff --git a/homedecor_gastronomy/depends.txt b/homedecor_gastronomy/depends.txt
new file mode 100644
index 0000000..c378b98
--- /dev/null
+++ b/homedecor_gastronomy/depends.txt
@@ -0,0 +1,7 @@
+homedecor_common
+default
+basic_materials
+dye
+creative
+currency?
+bucket?
diff --git a/homedecor/gastronomy.lua b/homedecor_gastronomy/init.lua
index 8274b3f..2d0a399 100644
--- a/homedecor/gastronomy.lua
+++ b/homedecor_gastronomy/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local cutlery_cbox = {
 	type = "fixed",
@@ -104,22 +104,6 @@ homedecor.register("wine_rack", {
 	sounds = default.node_sound_defaults(),
 })
 
-homedecor.register("dartboard", {
-	description = S("Dartboard"),
-	mesh = "homedecor_dartboard.obj",
-	tiles = { "homedecor_dartboard.png" },
-	inventory_image = "homedecor_dartboard_inv.png",
-	wield_image = "homedecor_dartboard_inv.png",
-	paramtype2 = "wallmounted",
-	walkable = false,
-	selection_box = {
-		type = "wallmounted",
-	},
-	groups = {choppy=2,dig_immediate=2,attached_node=1},
-	legacy_wallmounted = true,
-	sounds = default.node_sound_wood_defaults(),
-})
-
 homedecor.register("beer_tap", {
 	description = S("Beer tap"),
 	mesh = "homedecor_beer_taps.obj",
@@ -236,3 +220,218 @@ homedecor.register("soda_machine", {
 })
 
 minetest.register_alias("homedecor:coin", "currency:minegeld_cent_25")
+
+-- coffee!
+-- coffee!
+-- coffee!
+
+local cm_cbox = {
+	type = "fixed",
+	fixed = {
+		{     0, -8/16,     0,  7/16,  3/16,  8/16 },
+		{ -4/16, -8/16, -6/16, -1/16, -5/16, -3/16 }
+	}
+}
+
+homedecor.register("coffee_maker", {
+	mesh = "homedecor_coffeemaker.obj",
+	tiles = {
+		"homedecor_coffeemaker_decanter.png",
+		"homedecor_coffeemaker_cup.png",
+		"homedecor_coffeemaker_case.png",
+	},
+	description = S("Coffee Maker"),
+	inventory_image = "homedecor_coffeemaker_inv.png",
+	walkable = false,
+	groups = {snappy=3},
+	selection_box = cm_cbox,
+	node_box = cm_cbox,
+	on_rotate = screwdriver.disallow
+})
+
+homedecor.register("toaster", {
+	description = S("Toaster"),
+	tiles = { "homedecor_toaster_sides.png" },
+	inventory_image = "homedecor_toaster_inv.png",
+	walkable = false,
+	groups = { snappy=3 },
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.0625, -0.5, -0.125, 0.125, -0.3125, 0.125}, -- NodeBox1
+		},
+	},
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		local fdir = node.param2
+		minetest.set_node(pos, { name = "homedecor:toaster_loaf", param2 = fdir })
+		minetest.sound_play("toaster", {
+			pos = pos,
+			gain = 1.0,
+			max_hear_distance = 5
+		})
+		return itemstack
+	end
+})
+
+homedecor.register("toaster_loaf", {
+	tiles = {
+		"homedecor_toaster_toploaf.png",
+		"homedecor_toaster_sides.png",
+		"homedecor_toaster_sides.png",
+		"homedecor_toaster_sides.png",
+		"homedecor_toaster_sides.png",
+		"homedecor_toaster_sides.png"
+	},
+	walkable = false,
+	groups = { snappy=3, not_in_creative_inventory=1 },
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.0625, -0.5, -0.125, 0.125, -0.3125, 0.125}, -- NodeBox1
+			{-0.03125, -0.3125, -0.0935, 0, -0.25, 0.0935}, -- NodeBox2
+			{0.0625, -0.3125, -0.0935, 0.0935, -0.25, 0.0935}, -- NodeBox3
+		},
+	},
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		local fdir = node.param2
+		minetest.set_node(pos, { name = "homedecor:toaster", param2 = fdir })
+		return itemstack
+	end,
+	drop = "homedecor:toaster"
+})
+
+local fdir_to_steampos = {
+	x = { 0.15,   0.275, -0.15,  -0.275 },
+	z = { 0.275, -0.15,  -0.275,  0.15  }
+}
+
+minetest.register_abm({
+	nodenames = "homedecor:coffee_maker",
+	label = "sfx",
+	interval = 2,
+	chance = 1,
+	action = function(pos, node)
+		local fdir = node.param2
+		if fdir and fdir < 4 then
+
+			local steamx = fdir_to_steampos.x[fdir + 1]
+			local steamz = fdir_to_steampos.z[fdir + 1]
+
+			minetest.add_particlespawner({
+				amount = 1,
+				time = 1,
+				minpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz},
+				maxpos = {x=pos.x - steamx, y=pos.y - 0.35, z=pos.z - steamz},
+				minvel = {x=-0.003, y=0.01, z=-0.003},
+				maxvel = {x=0.003, y=0.01, z=-0.003},
+				minacc = {x=0.0,y=-0.0,z=-0.0},
+				maxacc = {x=0.0,y=0.003,z=-0.0},
+				minexptime = 2,
+				maxexptime = 5,
+				minsize = 1,
+				maxsize = 1.2,
+				collisiondetection = false,
+				texture = "homedecor_steam.png",
+			})
+		end
+	end
+})
+
+-- crafting
+
+minetest.register_craftitem(":homedecor:soda_can", {
+	description = S("Soda Can"),
+	inventory_image = "homedecor_soda_can.png",
+	on_use = minetest.item_eat(2),
+})
+
+minetest.register_craft( {
+        output = "homedecor:bottle_green",
+        recipe = {
+			{ "vessels:glass_bottle", "dye:green" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:bottle_brown",
+        recipe = {
+			{ "vessels:glass_bottle", "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({
+	output = "homedecor:beer_tap",
+	recipe = {
+		{ "group:stick","default:steel_ingot","group:stick" },
+		{ "homedecor:kitchen_faucet","default:steel_ingot","homedecor:kitchen_faucet" },
+		{ "default:steel_ingot","default:steel_ingot","default:steel_ingot" }
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:4_bottles_brown",
+	recipe = {
+		"homedecor:bottle_brown",
+		"homedecor:bottle_brown",
+		"homedecor:bottle_brown",
+		"homedecor:bottle_brown"
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:4_bottles_green",
+	recipe = {
+		"homedecor:bottle_green",
+		"homedecor:bottle_green",
+		"homedecor:bottle_green",
+		"homedecor:bottle_green"
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:4_bottles_multi",
+	recipe = {
+		"homedecor:bottle_brown",
+		"homedecor:bottle_brown",
+		"homedecor:bottle_green",
+		"homedecor:bottle_green",
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:wine_rack",
+	recipe = {
+		{ "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" },
+		{ "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" },
+		{ "homedecor:4_bottles_brown", "group:wood", "homedecor:4_bottles_brown" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:soda_machine",
+	recipe = {
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+		{"default:steel_ingot", "dye:red", "default:steel_ingot"},
+		{"default:steel_ingot", "default:copperblock", "default:steel_ingot"},
+	},
+})
diff --git a/homedecor/models/homedecor_4_bottles.obj b/homedecor_gastronomy/models/homedecor_4_bottles.obj
index 345547f..345547f 100644
--- a/homedecor/models/homedecor_4_bottles.obj
+++ b/homedecor_gastronomy/models/homedecor_4_bottles.obj
diff --git a/homedecor/models/homedecor_beer_mug.obj b/homedecor_gastronomy/models/homedecor_beer_mug.obj
index 4e1d6e7..4e1d6e7 100644
--- a/homedecor/models/homedecor_beer_mug.obj
+++ b/homedecor_gastronomy/models/homedecor_beer_mug.obj
diff --git a/homedecor/models/homedecor_beer_taps.obj b/homedecor_gastronomy/models/homedecor_beer_taps.obj
index 87929b8..87929b8 100644
--- a/homedecor/models/homedecor_beer_taps.obj
+++ b/homedecor_gastronomy/models/homedecor_beer_taps.obj
diff --git a/homedecor/models/homedecor_bottle.obj b/homedecor_gastronomy/models/homedecor_bottle.obj
index 03ecf93..03ecf93 100644
--- a/homedecor/models/homedecor_bottle.obj
+++ b/homedecor_gastronomy/models/homedecor_bottle.obj
diff --git a/homedecor/models/homedecor_coffeemaker.obj b/homedecor_gastronomy/models/homedecor_coffeemaker.obj
index 0c54445..0c54445 100644
--- a/homedecor/models/homedecor_coffeemaker.obj
+++ b/homedecor_gastronomy/models/homedecor_coffeemaker.obj
diff --git a/homedecor/models/homedecor_cutlery_set.obj b/homedecor_gastronomy/models/homedecor_cutlery_set.obj
index 5bdc782..5bdc782 100644
--- a/homedecor/models/homedecor_cutlery_set.obj
+++ b/homedecor_gastronomy/models/homedecor_cutlery_set.obj
diff --git a/homedecor/models/homedecor_soda_machine.obj b/homedecor_gastronomy/models/homedecor_soda_machine.obj
index 66d651f..66d651f 100644
--- a/homedecor/models/homedecor_soda_machine.obj
+++ b/homedecor_gastronomy/models/homedecor_soda_machine.obj
diff --git a/homedecor/models/homedecor_wine_rack.obj b/homedecor_gastronomy/models/homedecor_wine_rack.obj
index 49dc387..49dc387 100644
--- a/homedecor/models/homedecor_wine_rack.obj
+++ b/homedecor_gastronomy/models/homedecor_wine_rack.obj
diff --git a/homedecor/textures/homedecor_4_bottles_brown_inv.png b/homedecor_gastronomy/textures/homedecor_4_bottles_brown_inv.png
index 1ba0c98..1ba0c98 100644
--- a/homedecor/textures/homedecor_4_bottles_brown_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_4_bottles_brown_inv.png
diff --git a/homedecor/textures/homedecor_4_bottles_green_inv.png b/homedecor_gastronomy/textures/homedecor_4_bottles_green_inv.png
index dccf150..dccf150 100644
--- a/homedecor/textures/homedecor_4_bottles_green_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_4_bottles_green_inv.png
diff --git a/homedecor/textures/homedecor_4_bottles_multi_inv.png b/homedecor_gastronomy/textures/homedecor_4_bottles_multi_inv.png
index 6ebc807..6ebc807 100644
--- a/homedecor/textures/homedecor_4_bottles_multi_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_4_bottles_multi_inv.png
diff --git a/homedecor/textures/homedecor_beer_mug.png b/homedecor_gastronomy/textures/homedecor_beer_mug.png
index 2a80924..2a80924 100644
--- a/homedecor/textures/homedecor_beer_mug.png
+++ b/homedecor_gastronomy/textures/homedecor_beer_mug.png
diff --git a/homedecor/textures/homedecor_beer_mug_inv.png b/homedecor_gastronomy/textures/homedecor_beer_mug_inv.png
index 1887d5d..1887d5d 100644
--- a/homedecor/textures/homedecor_beer_mug_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_beer_mug_inv.png
diff --git a/homedecor/textures/homedecor_beertap_inv.png b/homedecor_gastronomy/textures/homedecor_beertap_inv.png
index 3090df1..3090df1 100644
--- a/homedecor/textures/homedecor_beertap_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_beertap_inv.png
diff --git a/homedecor/textures/homedecor_bottle_brown.png b/homedecor_gastronomy/textures/homedecor_bottle_brown.png
index a13b221..a13b221 100644
--- a/homedecor/textures/homedecor_bottle_brown.png
+++ b/homedecor_gastronomy/textures/homedecor_bottle_brown.png
diff --git a/homedecor/textures/homedecor_bottle_brown2.png b/homedecor_gastronomy/textures/homedecor_bottle_brown2.png
index ab3364f..ab3364f 100644
--- a/homedecor/textures/homedecor_bottle_brown2.png
+++ b/homedecor_gastronomy/textures/homedecor_bottle_brown2.png
diff --git a/homedecor/textures/homedecor_bottle_brown3.png b/homedecor_gastronomy/textures/homedecor_bottle_brown3.png
index 614a042..614a042 100644
--- a/homedecor/textures/homedecor_bottle_brown3.png
+++ b/homedecor_gastronomy/textures/homedecor_bottle_brown3.png
diff --git a/homedecor/textures/homedecor_bottle_brown4.png b/homedecor_gastronomy/textures/homedecor_bottle_brown4.png
index d9c578a..d9c578a 100644
--- a/homedecor/textures/homedecor_bottle_brown4.png
+++ b/homedecor_gastronomy/textures/homedecor_bottle_brown4.png
diff --git a/homedecor/textures/homedecor_bottle_brown_inv.png b/homedecor_gastronomy/textures/homedecor_bottle_brown_inv.png
index aff22d0..aff22d0 100644
--- a/homedecor/textures/homedecor_bottle_brown_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_bottle_brown_inv.png
diff --git a/homedecor/textures/homedecor_bottle_green.png b/homedecor_gastronomy/textures/homedecor_bottle_green.png
index b8a4846..b8a4846 100644
--- a/homedecor/textures/homedecor_bottle_green.png
+++ b/homedecor_gastronomy/textures/homedecor_bottle_green.png
diff --git a/homedecor/textures/homedecor_bottle_green_inv.png b/homedecor_gastronomy/textures/homedecor_bottle_green_inv.png
index 1f06e80..1f06e80 100644
--- a/homedecor/textures/homedecor_bottle_green_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_bottle_green_inv.png
diff --git a/homedecor/textures/homedecor_coffeemaker_case.png b/homedecor_gastronomy/textures/homedecor_coffeemaker_case.png
index ebc3541..ebc3541 100644
--- a/homedecor/textures/homedecor_coffeemaker_case.png
+++ b/homedecor_gastronomy/textures/homedecor_coffeemaker_case.png
diff --git a/homedecor/textures/homedecor_coffeemaker_cup.png b/homedecor_gastronomy/textures/homedecor_coffeemaker_cup.png
index 3422dee..3422dee 100644
--- a/homedecor/textures/homedecor_coffeemaker_cup.png
+++ b/homedecor_gastronomy/textures/homedecor_coffeemaker_cup.png
diff --git a/homedecor/textures/homedecor_coffeemaker_decanter.png b/homedecor_gastronomy/textures/homedecor_coffeemaker_decanter.png
index f7a5f86..f7a5f86 100644
--- a/homedecor/textures/homedecor_coffeemaker_decanter.png
+++ b/homedecor_gastronomy/textures/homedecor_coffeemaker_decanter.png
diff --git a/homedecor/textures/homedecor_coffeemaker_inv.png b/homedecor_gastronomy/textures/homedecor_coffeemaker_inv.png
index 57fe7df..57fe7df 100644
--- a/homedecor/textures/homedecor_coffeemaker_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_coffeemaker_inv.png
diff --git a/homedecor/textures/homedecor_cutlery_set.png b/homedecor_gastronomy/textures/homedecor_cutlery_set.png
index 57b27bf..57b27bf 100644
--- a/homedecor/textures/homedecor_cutlery_set.png
+++ b/homedecor_gastronomy/textures/homedecor_cutlery_set.png
diff --git a/homedecor/textures/homedecor_cutlery_set_inv.png b/homedecor_gastronomy/textures/homedecor_cutlery_set_inv.png
index 9dcd1df..9dcd1df 100644
--- a/homedecor/textures/homedecor_cutlery_set_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_cutlery_set_inv.png
diff --git a/homedecor/textures/homedecor_soda_can.png b/homedecor_gastronomy/textures/homedecor_soda_can.png
index 2797b6e..2797b6e 100644
--- a/homedecor/textures/homedecor_soda_can.png
+++ b/homedecor_gastronomy/textures/homedecor_soda_can.png
diff --git a/homedecor/textures/homedecor_soda_machine.png b/homedecor_gastronomy/textures/homedecor_soda_machine.png
index 82f0ab9..82f0ab9 100644
--- a/homedecor/textures/homedecor_soda_machine.png
+++ b/homedecor_gastronomy/textures/homedecor_soda_machine.png
diff --git a/homedecor/textures/homedecor_steam.png b/homedecor_gastronomy/textures/homedecor_steam.png
index 2de3d1b..2de3d1b 100644
--- a/homedecor/textures/homedecor_steam.png
+++ b/homedecor_gastronomy/textures/homedecor_steam.png
diff --git a/homedecor/textures/homedecor_toaster_inv.png b/homedecor_gastronomy/textures/homedecor_toaster_inv.png
index 7291c0b..7291c0b 100644
--- a/homedecor/textures/homedecor_toaster_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_toaster_inv.png
diff --git a/homedecor/textures/homedecor_toaster_sides.png b/homedecor_gastronomy/textures/homedecor_toaster_sides.png
index 79395ac..79395ac 100644
--- a/homedecor/textures/homedecor_toaster_sides.png
+++ b/homedecor_gastronomy/textures/homedecor_toaster_sides.png
diff --git a/homedecor/textures/homedecor_toaster_toploaf.png b/homedecor_gastronomy/textures/homedecor_toaster_toploaf.png
index 9cad61f..9cad61f 100644
--- a/homedecor/textures/homedecor_toaster_toploaf.png
+++ b/homedecor_gastronomy/textures/homedecor_toaster_toploaf.png
diff --git a/homedecor/textures/homedecor_wine_rack_inv.png b/homedecor_gastronomy/textures/homedecor_wine_rack_inv.png
index 6281131..6281131 100644
--- a/homedecor/textures/homedecor_wine_rack_inv.png
+++ b/homedecor_gastronomy/textures/homedecor_wine_rack_inv.png
diff --git a/homedecor_i18n/depends.txt b/homedecor_i18n/depends.txt
deleted file mode 100644
index 77e8d97..0000000
--- a/homedecor_i18n/depends.txt
+++ /dev/null
@@ -1 +0,0 @@
-intllib?
diff --git a/homedecor_i18n/init.lua b/homedecor_i18n/init.lua
deleted file mode 100644
index 1256ff1..0000000
--- a/homedecor_i18n/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-
--- This file intentionally left blank.
-
-homedecor_i18n = { }
-
-local MP = minetest.get_modpath(minetest.get_current_modname())
-homedecor_i18n.gettext, homedecor_i18n.ngettext = dofile(MP.."/intllib.lua")
diff --git a/homedecor_kitchen/depends.txt b/homedecor_kitchen/depends.txt
new file mode 100644
index 0000000..d122ec0
--- /dev/null
+++ b/homedecor_kitchen/depends.txt
@@ -0,0 +1,8 @@
+homedecor_common
+default
+basic_materials
+dye
+moreblocks?
+building_blocks?
+technic?
+bucket?
diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua
new file mode 100644
index 0000000..56cc9c7
--- /dev/null
+++ b/homedecor_kitchen/init.lua
@@ -0,0 +1,550 @@
+-- This file supplies Kitchen stuff like refrigerators, sinks, etc.
+
+local S = homedecor.gettext
+
+local function N_(x) return x end
+
+-- steel-textured fridge
+homedecor.register("refrigerator_steel", {
+	mesh = "homedecor_refrigerator.obj",
+	tiles = { "homedecor_refrigerator_steel.png" },
+	inventory_image = "homedecor_refrigerator_steel_inv.png",
+	description = S("Refrigerator (stainless steel)"),
+	groups = {snappy=3},
+	sounds = default.node_sound_stone_defaults(),
+	selection_box = homedecor.nodebox.slab_y(2),
+	collision_box = homedecor.nodebox.slab_y(2),
+	expand = { top="placeholder" },
+	infotext=S("Refrigerator"),
+	inventory = {
+		size=50,
+		lockable=true,
+	},
+	on_rotate = screwdriver.rotate_simple
+})
+
+-- white, enameled fridge
+homedecor.register("refrigerator_white", {
+	mesh = "homedecor_refrigerator.obj",
+	tiles = { "homedecor_refrigerator_white.png" },
+	inventory_image = "homedecor_refrigerator_white_inv.png",
+	description = S("Refrigerator"),
+	groups = {snappy=3},
+	selection_box = homedecor.nodebox.slab_y(2),
+	collision_box = homedecor.nodebox.slab_y(2),
+	sounds = default.node_sound_stone_defaults(),
+	expand = { top="placeholder" },
+	infotext=S("Refrigerator"),
+	inventory = {
+		size=50,
+		lockable=true,
+	},
+	on_rotate = screwdriver.rotate_simple
+})
+
+minetest.register_alias("homedecor:refrigerator_white_bottom", "homedecor:refrigerator_white")
+minetest.register_alias("homedecor:refrigerator_white_top", "air")
+
+minetest.register_alias("homedecor:refrigerator_steel_bottom", "homedecor:refrigerator_steel")
+minetest.register_alias("homedecor:refrigerator_steel_top", "air")
+
+minetest.register_alias("homedecor:refrigerator_white_bottom_locked", "homedecor:refrigerator_white_locked")
+minetest.register_alias("homedecor:refrigerator_white_top_locked", "air")
+minetest.register_alias("homedecor:refrigerator_locked", "homedecor:refrigerator_white_locked")
+
+minetest.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor:refrigerator_steel_locked")
+minetest.register_alias("homedecor:refrigerator_steel_top_locked", "air")
+
+-- kitchen "furnaces"
+homedecor.register_furnace("oven", {
+	description = S("Oven"),
+	tile_format = "homedecor_oven_%s%s.png",
+	output_slots = 4,
+	output_width = 2,
+	cook_speed = 1.25,
+})
+
+homedecor.register_furnace("oven_steel", {
+	description = S("Oven (stainless steel)"),
+	tile_format = "homedecor_oven_steel_%s%s.png",
+	output_slots = 4,
+	output_width = 2,
+	cook_speed = 1.25,
+})
+
+homedecor.register_furnace("microwave_oven", {
+	description = S("Microwave Oven"),
+	tiles = {
+		"homedecor_microwave_top.png", "homedecor_microwave_top.png^[transformR180",
+		"homedecor_microwave_top.png^[transformR270", "homedecor_microwave_top.png^[transformR90",
+		"homedecor_microwave_top.png^[transformR180", "homedecor_microwave_front.png"
+	},
+	tiles_active = {
+		"homedecor_microwave_top.png", "homedecor_microwave_top.png^[transformR180",
+		"homedecor_microwave_top.png^[transformR270", "homedecor_microwave_top.png^[transformR90",
+		"homedecor_microwave_top.png^[transformR180", "homedecor_microwave_front_active.png"
+	},
+	output_slots = 2,
+	output_width = 2,
+	cook_speed = 1.5,
+	extra_nodedef_fields = {
+		node_box = {
+			type = "fixed",
+			fixed = { -0.5, -0.5, -0.125, 0.5, 0.125, 0.5 },
+		},
+	},
+})
+
+homedecor.register("dishwasher", {
+	description = S("Dishwasher"),
+	drawtype = "nodebox",
+	tiles = {
+		"homedecor_dishwasher_top.png",
+		"homedecor_dishwasher_bottom.png",
+		"homedecor_dishwasher_sides.png",
+		"homedecor_dishwasher_sides.png^[transformFX",
+		"homedecor_dishwasher_back.png",
+		"homedecor_dishwasher_front.png"
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
+			{-0.5, -0.5, -0.5, 0.5, 0.5, -0.4375},
+			{-0.5, -0.5, -0.5, 0.5, 0.1875, 0.1875},
+			{-0.4375, -0.5, -0.5, 0.4375, 0.4375, 0.4375},
+		}
+	},
+	selection_box = { type = "regular" },
+	sounds = default.node_sound_stone_defaults(),
+	groups = { snappy = 3 },
+})
+
+local materials = { N_("granite"), N_("marble"), N_("steel"), N_("wood") }
+
+for _, m in ipairs(materials) do
+homedecor.register("dishwasher_"..m, {
+	description = S("Dishwasher (@1)", S(m)),
+	tiles = {
+		"homedecor_kitchen_cabinet_top_"..m..".png",
+		"homedecor_dishwasher_bottom.png",
+		"homedecor_dishwasher_sides.png",
+		"homedecor_dishwasher_sides.png^[transformFX",
+		"homedecor_dishwasher_back.png",
+		"homedecor_dishwasher_front.png"
+	},
+	groups = { snappy = 3 },
+	sounds = default.node_sound_stone_defaults(),
+})
+end
+
+local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png"
+local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)"
+
+local function N_(x) return x end
+
+local counter_materials = { "", N_("granite"), N_("marble"), N_("steel") }
+
+for _, mat in ipairs(counter_materials) do
+
+	local desc = S("Kitchen Cabinet")
+	local material = ""
+
+	if mat ~= "" then
+		desc = S("Kitchen Cabinet (@1 top)", S(mat))
+		material = "_"..mat
+	end
+
+	homedecor.register("kitchen_cabinet"..material, {
+		description = desc,
+		tiles = { 'homedecor_kitchen_cabinet_top'..material..'.png',
+				cabinet_bottom,
+				cabinet_sides,
+				cabinet_sides,
+				cabinet_sides,
+				'homedecor_kitchen_cabinet_front.png'},
+		groups = { snappy = 3 },
+		sounds = default.node_sound_wood_defaults(),
+		infotext=S("Kitchen Cabinet"),
+		inventory = {
+			size=24,
+			lockable=true,
+		},
+	})
+end
+
+local kitchen_cabinet_half_box = homedecor.nodebox.slab_y(0.5, 0.5)
+homedecor.register("kitchen_cabinet_half", {
+	description = S('Half-height Kitchen Cabinet (on ceiling)'),
+	tiles = {
+		cabinet_sides,
+		cabinet_bottom,
+		cabinet_sides,
+		cabinet_sides,
+		cabinet_sides,
+		'homedecor_kitchen_cabinet_front_half.png'
+	},
+	selection_box = kitchen_cabinet_half_box,
+	node_box = kitchen_cabinet_half_box,
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+	infotext=S("Kitchen Cabinet"),
+	inventory = {
+		size=12,
+		lockable=true,
+	},
+})
+
+homedecor.register("kitchen_cabinet_with_sink", {
+	description = S("Kitchen Cabinet with sink"),
+	mesh = "homedecor_kitchen_sink.obj",
+	tiles = {
+		"homedecor_kitchen_sink_top.png",
+		"homedecor_kitchen_cabinet_front.png",
+		cabinet_sides,
+		cabinet_bottom
+	},
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+	infotext=S("Under-sink cabinet"),
+	inventory = {
+		size=16,
+		lockable=true,
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{ -8/16, -8/16, -8/16,  8/16, 6/16,  8/16 },
+			{ -8/16,  6/16, -8/16, -6/16, 8/16,  8/16 },
+			{  6/16,  6/16, -8/16,  8/16, 8/16,  8/16 },
+			{ -8/16,  6/16, -8/16,  8/16, 8/16, -6/16 },
+			{ -8/16,  6/16,  6/16,  8/16, 8/16,  8/16 },
+		}
+	},
+	on_destruct = function(pos)
+		homedecor.stop_particle_spawner({x=pos.x, y=pos.y+1, z=pos.z})
+	end
+})
+
+local cp_cbox = {
+	type = "fixed",
+	fixed = { -0.375, -0.5, -0.5, 0.375, -0.3125, 0.3125 }
+}
+
+homedecor.register("copper_pans", {
+	description = S("Copper pans"),
+	mesh = "homedecor_copper_pans.obj",
+	tiles = { "homedecor_polished_copper.png" },
+	inventory_image = "homedecor_copper_pans_inv.png",
+	groups = { snappy=3 },
+	selection_box = cp_cbox,
+	walkable = false,
+	on_place = minetest.rotate_node
+})
+
+local kf_cbox = {
+	type = "fixed",
+	fixed = { -2/16, -8/16, 1/16, 2/16, -1/16, 8/16 }
+}
+
+homedecor.register("kitchen_faucet", {
+	mesh = "homedecor_kitchen_faucet.obj",
+	tiles = { "homedecor_generic_metal_bright.png" },
+	inventory_image = "homedecor_kitchen_faucet_inv.png",
+	description = S("Kitchen Faucet"),
+	groups = {snappy=3},
+	selection_box = kf_cbox,
+	walkable = false,
+	on_rotate = screwdriver.disallow,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z})
+		if below and
+		  below.name == "homedecor:sink" or
+		  below.name == "homedecor:kitchen_cabinet_with_sink" or
+		  below.name == "homedecor:kitchen_cabinet_with_sink_locked" then
+			local particledef = {
+				outlet      = { x = 0, y = -0.19, z = 0.13 },
+				velocity_x  = { min = -0.05, max = 0.05 },
+				velocity_y  = -0.3,
+				velocity_z  = { min = -0.1,  max = 0 },
+				spread      = 0
+			}
+			homedecor.start_particle_spawner(pos, node, particledef, "homedecor_faucet")
+		end
+		return itemstack
+	end,
+	on_destruct = homedecor.stop_particle_spawner
+})
+
+homedecor.register("paper_towel", {
+	mesh = "homedecor_paper_towel.obj",
+	tiles = {
+		"homedecor_generic_quilted_paper.png",
+		"default_wood.png"
+	},
+	inventory_image = "homedecor_paper_towel_inv.png",
+	description = S("Paper towels"),
+	groups = { snappy=3 },
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 }
+	},
+})
+
+-- crafting
+
+
+minetest.register_craft({
+        output = "homedecor:oven_steel",
+        recipe = {
+		{"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", },
+		{"default:steel_ingot", "moreblocks:iron_glass", "default:steel_ingot", },
+		{"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", },
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:oven_steel",
+        recipe = {
+		{"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", },
+		{"default:steel_ingot", "default:glass", "default:steel_ingot", },
+		{"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", },
+	}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:oven",
+	recipe = {
+		"homedecor:oven_steel",
+		"dye:white",
+		"dye:white",
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:microwave_oven 2",
+        recipe = {
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", },
+		{"default:steel_ingot", "moreblocks:iron_glass", "basic_materials:ic", },
+		{"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", },
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:microwave_oven 2",
+        recipe = {
+		{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", },
+		{"default:steel_ingot", "default:glass", "basic_materials:ic", },
+		{"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", },
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:refrigerator_steel",
+	recipe = {
+		{"default:steel_ingot", "homedecor:glowlight_small_cube", "default:steel_ingot", },
+		{"default:steel_ingot", "default:copperblock", "default:steel_ingot", },
+		{"default:steel_ingot", "default:clay", "default:steel_ingot", },
+	}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "homedecor:refrigerator_white",
+	recipe = {
+		"homedecor:refrigerator_steel",
+		"dye:white",
+		"dye:white",
+		"dye:white",
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:kitchen_cabinet",
+        recipe = {
+		{"group:wood", "group:stick", "group:wood", },
+		{"group:wood", "group:stick", "group:wood", },
+		{"group:wood", "group:stick", "group:wood", },
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:kitchen_cabinet_steel",
+        recipe = {
+			{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
+			{"", "homedecor:kitchen_cabinet", ""},
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:kitchen_cabinet_steel",
+        recipe = {
+			{"moreblocks:slab_steelblock_1"},
+			{ "homedecor:kitchen_cabinet" },
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:kitchen_cabinet_marble",
+        recipe = {
+			{"building_blocks:slab_marble"},
+			{"homedecor:kitchen_cabinet"},
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:kitchen_cabinet_marble",
+        recipe = {
+			{"technic:slab_marble_1"},
+			{"homedecor:kitchen_cabinet"},
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:kitchen_cabinet_granite",
+        recipe = {
+			{"technic:slab_granite_1"},
+			{"homedecor:kitchen_cabinet"},
+	}
+})
+
+minetest.register_craft({
+	type = "shapeless",
+        output = "homedecor:kitchen_cabinet_half 2",
+        recipe = { "homedecor:kitchen_cabinet" }
+})
+
+minetest.register_craft({
+        output = "homedecor:kitchen_cabinet_with_sink",
+        recipe = {
+		{"group:wood", "default:steel_ingot", "group:wood", },
+		{"group:wood", "default:steel_ingot", "group:wood", },
+		{"group:wood", "group:stick", "group:wood", },
+	}
+})
+
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher",
+    recipe = {
+		{ "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot",  },
+		{ "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" },
+		{ "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" }
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher",
+    recipe = {
+		{ "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot",  },
+		{ "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" },
+		{ "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" }
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher_wood",
+    recipe = {
+		{ "stairs:slab_wood" },
+		{ "homedecor:dishwasher" },
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher_wood",
+    recipe = {
+		{ "moreblocks:slab_wood" },
+		{ "homedecor:dishwasher" },
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher_wood",
+    recipe = {
+		{ "moreblocks:slab_wood_1" },
+		{ "homedecor:dishwasher" },
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher_steel",
+    recipe = {
+		{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" },
+		{ "", "homedecor:dishwasher", "" },
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher_steel",
+    recipe = {
+		{ "moreblocks:slab_steelblock_1" },
+		{ "homedecor:dishwasher" },
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher_marble",
+    recipe = {
+		{ "building_blocks:slab_marble" },
+		{ "homedecor:dishwasher" },
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher_marble",
+    recipe = {
+		{ "technic:slab_marble_1" },
+		{ "homedecor:dishwasher" },
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dishwasher_granite",
+    recipe = {
+		{ "technic:slab_granite_1" },
+		{ "homedecor:dishwasher" },
+    },
+})
+
+minetest.register_craft( {
+        output = "homedecor:kitchen_faucet",
+        recipe = {
+			{ "", "default:steel_ingot" },
+			{ "default:steel_ingot", "" },
+			{ "homedecor:taps", "" }
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:cutlery_set",
+        recipe = {
+			{ "", "vessels:drinking_glass", "" },
+			{ "basic_materials:steel_strip", "building_blocks:slab_marble", "basic_materials:steel_strip" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:cutlery_set",
+        recipe = {
+			{ "", "vessels:drinking_glass", "" },
+			{ "basic_materials:steel_strip", "building_blocks:micro_marble_1", "basic_materials:steel_strip" },
+        },
+})
+
+minetest.register_craft({
+	output = "homedecor:copper_pans",
+	recipe = {
+		{ "basic_materials:copper_strip","","basic_materials:copper_strip" },
+		{ "default:copper_ingot","","default:copper_ingot" },
+		{ "default:copper_ingot","","default:copper_ingot" }
+	},
+})
+
+minetest.register_craft({
+    output = "homedecor:paper_towel",
+    recipe = {
+		{ "homedecor:toilet_paper", "homedecor:toilet_paper" }
+    },
+})
diff --git a/homedecor/models/homedecor_copper_pans.obj b/homedecor_kitchen/models/homedecor_copper_pans.obj
index 20f8437..20f8437 100644
--- a/homedecor/models/homedecor_copper_pans.obj
+++ b/homedecor_kitchen/models/homedecor_copper_pans.obj
diff --git a/homedecor/models/homedecor_kitchen_faucet.obj b/homedecor_kitchen/models/homedecor_kitchen_faucet.obj
index 3ca21d7..3ca21d7 100644
--- a/homedecor/models/homedecor_kitchen_faucet.obj
+++ b/homedecor_kitchen/models/homedecor_kitchen_faucet.obj
diff --git a/homedecor/models/homedecor_kitchen_sink.obj b/homedecor_kitchen/models/homedecor_kitchen_sink.obj
index d3126d0..d3126d0 100644
--- a/homedecor/models/homedecor_kitchen_sink.obj
+++ b/homedecor_kitchen/models/homedecor_kitchen_sink.obj
diff --git a/homedecor/models/homedecor_paper_towel.obj b/homedecor_kitchen/models/homedecor_paper_towel.obj
index f8c2a04..f8c2a04 100644
--- a/homedecor/models/homedecor_paper_towel.obj
+++ b/homedecor_kitchen/models/homedecor_paper_towel.obj
diff --git a/homedecor/models/homedecor_refrigerator.obj b/homedecor_kitchen/models/homedecor_refrigerator.obj
index 1cfb8ec..1cfb8ec 100644
--- a/homedecor/models/homedecor_refrigerator.obj
+++ b/homedecor_kitchen/models/homedecor_refrigerator.obj
diff --git a/homedecor/textures/homedecor_copper_pans_inv.png b/homedecor_kitchen/textures/homedecor_copper_pans_inv.png
index 08e21d2..08e21d2 100644
--- a/homedecor/textures/homedecor_copper_pans_inv.png
+++ b/homedecor_kitchen/textures/homedecor_copper_pans_inv.png
diff --git a/homedecor/textures/homedecor_dishwasher_back.png b/homedecor_kitchen/textures/homedecor_dishwasher_back.png
index 17c7dec..17c7dec 100644
--- a/homedecor/textures/homedecor_dishwasher_back.png
+++ b/homedecor_kitchen/textures/homedecor_dishwasher_back.png
diff --git a/homedecor/textures/homedecor_dishwasher_bottom.png b/homedecor_kitchen/textures/homedecor_dishwasher_bottom.png
index 7798e53..7798e53 100644
--- a/homedecor/textures/homedecor_dishwasher_bottom.png
+++ b/homedecor_kitchen/textures/homedecor_dishwasher_bottom.png
diff --git a/homedecor/textures/homedecor_dishwasher_front.png b/homedecor_kitchen/textures/homedecor_dishwasher_front.png
index a8cd657..a8cd657 100644
--- a/homedecor/textures/homedecor_dishwasher_front.png
+++ b/homedecor_kitchen/textures/homedecor_dishwasher_front.png
diff --git a/homedecor/textures/homedecor_dishwasher_sides.png b/homedecor_kitchen/textures/homedecor_dishwasher_sides.png
index 6bd93d7..6bd93d7 100644
--- a/homedecor/textures/homedecor_dishwasher_sides.png
+++ b/homedecor_kitchen/textures/homedecor_dishwasher_sides.png
diff --git a/homedecor/textures/homedecor_dishwasher_top.png b/homedecor_kitchen/textures/homedecor_dishwasher_top.png
index de344c5..de344c5 100644
--- a/homedecor/textures/homedecor_dishwasher_top.png
+++ b/homedecor_kitchen/textures/homedecor_dishwasher_top.png
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_bevel.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_bevel.png
index 137eb3e..137eb3e 100644
--- a/homedecor/textures/homedecor_kitchen_cabinet_bevel.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_bevel.png
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_front.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front.png
index 1021b2d..1021b2d 100644
--- a/homedecor/textures/homedecor_kitchen_cabinet_front.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front.png
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_front_half.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_half.png
index bd211e6..bd211e6 100644
--- a/homedecor/textures/homedecor_kitchen_cabinet_front_half.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_half.png
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top.png
index 983f482..983f482 100644
--- a/homedecor/textures/homedecor_kitchen_cabinet_top.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top.png
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_granite.png
index 82b4bdb..82b4bdb 100644
--- a/homedecor/textures/homedecor_kitchen_cabinet_top_granite.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_granite.png
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top_marble.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_marble.png
index 7f5c1a3..7f5c1a3 100644
--- a/homedecor/textures/homedecor_kitchen_cabinet_top_marble.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_marble.png
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top_steel.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_steel.png
index 9cc6c7b..9cc6c7b 100644
--- a/homedecor/textures/homedecor_kitchen_cabinet_top_steel.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_steel.png
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_top_wood.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_wood.png
index 983f482..983f482 100644
--- a/homedecor/textures/homedecor_kitchen_cabinet_top_wood.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_top_wood.png
diff --git a/homedecor/textures/homedecor_kitchen_faucet_inv.png b/homedecor_kitchen/textures/homedecor_kitchen_faucet_inv.png
index f1cbe58..f1cbe58 100644
--- a/homedecor/textures/homedecor_kitchen_faucet_inv.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_faucet_inv.png
diff --git a/homedecor/textures/homedecor_kitchen_sink_top.png b/homedecor_kitchen/textures/homedecor_kitchen_sink_top.png
index a4f7544..a4f7544 100644
--- a/homedecor/textures/homedecor_kitchen_sink_top.png
+++ b/homedecor_kitchen/textures/homedecor_kitchen_sink_top.png
diff --git a/homedecor/textures/homedecor_microwave_front.png b/homedecor_kitchen/textures/homedecor_microwave_front.png
index 8d5319b..8d5319b 100644
--- a/homedecor/textures/homedecor_microwave_front.png
+++ b/homedecor_kitchen/textures/homedecor_microwave_front.png
diff --git a/homedecor/textures/homedecor_microwave_front_active.png b/homedecor_kitchen/textures/homedecor_microwave_front_active.png
index e438a10..e438a10 100644
--- a/homedecor/textures/homedecor_microwave_front_active.png
+++ b/homedecor_kitchen/textures/homedecor_microwave_front_active.png
diff --git a/homedecor/textures/homedecor_microwave_top.png b/homedecor_kitchen/textures/homedecor_microwave_top.png
index 8f5c3ff..8f5c3ff 100644
--- a/homedecor/textures/homedecor_microwave_top.png
+++ b/homedecor_kitchen/textures/homedecor_microwave_top.png
diff --git a/homedecor/textures/homedecor_oven_bottom.png b/homedecor_kitchen/textures/homedecor_oven_bottom.png
index 56550a6..56550a6 100644
--- a/homedecor/textures/homedecor_oven_bottom.png
+++ b/homedecor_kitchen/textures/homedecor_oven_bottom.png
diff --git a/homedecor/textures/homedecor_oven_front.png b/homedecor_kitchen/textures/homedecor_oven_front.png
index 07a9275..07a9275 100644
--- a/homedecor/textures/homedecor_oven_front.png
+++ b/homedecor_kitchen/textures/homedecor_oven_front.png
diff --git a/homedecor/textures/homedecor_oven_front_active.png b/homedecor_kitchen/textures/homedecor_oven_front_active.png
index 0194b5a..0194b5a 100644
--- a/homedecor/textures/homedecor_oven_front_active.png
+++ b/homedecor_kitchen/textures/homedecor_oven_front_active.png
diff --git a/homedecor/textures/homedecor_oven_side.png b/homedecor_kitchen/textures/homedecor_oven_side.png
index 6694b34..6694b34 100644
--- a/homedecor/textures/homedecor_oven_side.png
+++ b/homedecor_kitchen/textures/homedecor_oven_side.png
diff --git a/homedecor/textures/homedecor_oven_steel_bottom.png b/homedecor_kitchen/textures/homedecor_oven_steel_bottom.png
index 56550a6..56550a6 100644
--- a/homedecor/textures/homedecor_oven_steel_bottom.png
+++ b/homedecor_kitchen/textures/homedecor_oven_steel_bottom.png
diff --git a/homedecor/textures/homedecor_oven_steel_front.png b/homedecor_kitchen/textures/homedecor_oven_steel_front.png
index a5935a9..a5935a9 100644
--- a/homedecor/textures/homedecor_oven_steel_front.png
+++ b/homedecor_kitchen/textures/homedecor_oven_steel_front.png
diff --git a/homedecor/textures/homedecor_oven_steel_front_active.png b/homedecor_kitchen/textures/homedecor_oven_steel_front_active.png
index 73d48f5..73d48f5 100644
--- a/homedecor/textures/homedecor_oven_steel_front_active.png
+++ b/homedecor_kitchen/textures/homedecor_oven_steel_front_active.png
diff --git a/homedecor/textures/homedecor_oven_steel_side.png b/homedecor_kitchen/textures/homedecor_oven_steel_side.png
index 778e581..778e581 100644
--- a/homedecor/textures/homedecor_oven_steel_side.png
+++ b/homedecor_kitchen/textures/homedecor_oven_steel_side.png
diff --git a/homedecor/textures/homedecor_oven_steel_top.png b/homedecor_kitchen/textures/homedecor_oven_steel_top.png
index f2a80f9..f2a80f9 100644
--- a/homedecor/textures/homedecor_oven_steel_top.png
+++ b/homedecor_kitchen/textures/homedecor_oven_steel_top.png
diff --git a/homedecor/textures/homedecor_oven_top.png b/homedecor_kitchen/textures/homedecor_oven_top.png
index cd2f6b4..cd2f6b4 100644
--- a/homedecor/textures/homedecor_oven_top.png
+++ b/homedecor_kitchen/textures/homedecor_oven_top.png
diff --git a/homedecor/textures/homedecor_paper_towel_inv.png b/homedecor_kitchen/textures/homedecor_paper_towel_inv.png
index b7d14b4..b7d14b4 100644
--- a/homedecor/textures/homedecor_paper_towel_inv.png
+++ b/homedecor_kitchen/textures/homedecor_paper_towel_inv.png
diff --git a/homedecor/textures/homedecor_refrigerator_steel.png b/homedecor_kitchen/textures/homedecor_refrigerator_steel.png
index 7bfe2bb..7bfe2bb 100644
--- a/homedecor/textures/homedecor_refrigerator_steel.png
+++ b/homedecor_kitchen/textures/homedecor_refrigerator_steel.png
diff --git a/homedecor/textures/homedecor_refrigerator_steel_inv.png b/homedecor_kitchen/textures/homedecor_refrigerator_steel_inv.png
index ef02873..ef02873 100644
--- a/homedecor/textures/homedecor_refrigerator_steel_inv.png
+++ b/homedecor_kitchen/textures/homedecor_refrigerator_steel_inv.png
diff --git a/homedecor/textures/homedecor_refrigerator_white.png b/homedecor_kitchen/textures/homedecor_refrigerator_white.png
index ee6156a..ee6156a 100644
--- a/homedecor/textures/homedecor_refrigerator_white.png
+++ b/homedecor_kitchen/textures/homedecor_refrigerator_white.png
diff --git a/homedecor/textures/homedecor_refrigerator_white_inv.png b/homedecor_kitchen/textures/homedecor_refrigerator_white_inv.png
index 0271e39..0271e39 100644
--- a/homedecor/textures/homedecor_refrigerator_white_inv.png
+++ b/homedecor_kitchen/textures/homedecor_refrigerator_white_inv.png
diff --git a/homedecor_laundry/depends.txt b/homedecor_laundry/depends.txt
new file mode 100644
index 0000000..4536f36
--- /dev/null
+++ b/homedecor_laundry/depends.txt
@@ -0,0 +1,4 @@
+homedecor_common
+default
+basic_materials
+bucket?
diff --git a/homedecor_laundry/init.lua b/homedecor_laundry/init.lua
new file mode 100644
index 0000000..ee59c8c
--- /dev/null
+++ b/homedecor_laundry/init.lua
@@ -0,0 +1,112 @@
+-- laundry devices
+
+homedecor.register("washing_machine", {
+	description = "Washing Machine",
+	tiles = {
+		"homedecor_washing_machine_top.png",
+		"homedecor_washing_machine_bottom.png",
+		"homedecor_washing_machine_sides.png",
+		"homedecor_washing_machine_sides.png^[transformFX",
+		"homedecor_washing_machine_back.png",
+		"homedecor_washing_machine_front.png"
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, 0.375, 0.375},
+			{-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5},
+		}
+	},
+	selection_box = { type = "regular" },
+	groups = { snappy = 3 },
+})
+
+homedecor.register("dryer", {
+	description = "Tumble dryer",
+	tiles = {
+		"homedecor_dryer_top.png",
+		"homedecor_dryer_bottom.png",
+		"homedecor_dryer_sides.png",
+		"homedecor_dryer_sides.png^[transformFX",
+		"homedecor_dryer_back.png",
+		"homedecor_dryer_front.png"
+	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, 0.375, 0.375},
+			{-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5},
+		}
+	},
+	selection_box = { type = "regular" },
+	groups = { snappy = 3 },
+})
+
+local ib_cbox = {
+	type = "fixed",
+	fixed = { -6/16, -8/16, -4/16, 17/16, 4/16, 4/16 }
+}
+
+homedecor.register("ironing_board", {
+	description = "Ironing board",
+	mesh = "homedecor_ironing_board.obj",
+	tiles = {
+		"wool_grey.png",
+		{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
+	},
+	expand = {right = "placeholder"},
+	groups = { snappy = 3 },
+	selection_box = ib_cbox,
+	collision_box = ib_cbox
+})
+
+-- crafting
+
+
+-- laundry stuff
+
+minetest.register_craft( {
+    output = "homedecor:washing_machine",
+    recipe = {
+		{ "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" },
+		{ "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" },
+		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:washing_machine",
+    recipe = {
+		{ "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" },
+		{ "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" },
+		{ "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dryer",
+    recipe = {
+		{ "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" },
+		{ "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" },
+		{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:dryer",
+    recipe = {
+		{ "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" },
+		{ "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" },
+		{ "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }
+    },
+})
+
+minetest.register_craft( {
+    output = "homedecor:ironing_board",
+    recipe = {
+		{ "wool:grey", "wool:grey", "wool:grey"},
+		{ "", "default:steel_ingot", "" },
+		{ "default:steel_ingot", "", "default:steel_ingot" }
+    },
+})
+
diff --git a/homedecor/models/homedecor_ironing_board.obj b/homedecor_laundry/models/homedecor_ironing_board.obj
index f0cfc65..f0cfc65 100644
--- a/homedecor/models/homedecor_ironing_board.obj
+++ b/homedecor_laundry/models/homedecor_ironing_board.obj
diff --git a/homedecor/textures/homedecor_dryer_back.png b/homedecor_laundry/textures/homedecor_dryer_back.png
index b085c63..b085c63 100644
--- a/homedecor/textures/homedecor_dryer_back.png
+++ b/homedecor_laundry/textures/homedecor_dryer_back.png
diff --git a/homedecor/textures/homedecor_dryer_bottom.png b/homedecor_laundry/textures/homedecor_dryer_bottom.png
index 25f7416..25f7416 100644
--- a/homedecor/textures/homedecor_dryer_bottom.png
+++ b/homedecor_laundry/textures/homedecor_dryer_bottom.png
diff --git a/homedecor/textures/homedecor_dryer_front.png b/homedecor_laundry/textures/homedecor_dryer_front.png
index 2fc8d8e..2fc8d8e 100644
--- a/homedecor/textures/homedecor_dryer_front.png
+++ b/homedecor_laundry/textures/homedecor_dryer_front.png
diff --git a/homedecor/textures/homedecor_dryer_sides.png b/homedecor_laundry/textures/homedecor_dryer_sides.png
index 6cb3c8f..6cb3c8f 100644
--- a/homedecor/textures/homedecor_dryer_sides.png
+++ b/homedecor_laundry/textures/homedecor_dryer_sides.png
diff --git a/homedecor/textures/homedecor_dryer_top.png b/homedecor_laundry/textures/homedecor_dryer_top.png
index f416845..f416845 100644
--- a/homedecor/textures/homedecor_dryer_top.png
+++ b/homedecor_laundry/textures/homedecor_dryer_top.png
diff --git a/homedecor/textures/homedecor_washing_machine_back.png b/homedecor_laundry/textures/homedecor_washing_machine_back.png
index cca307a..cca307a 100644
--- a/homedecor/textures/homedecor_washing_machine_back.png
+++ b/homedecor_laundry/textures/homedecor_washing_machine_back.png
diff --git a/homedecor/textures/homedecor_washing_machine_bottom.png b/homedecor_laundry/textures/homedecor_washing_machine_bottom.png
index 9aea7ab..9aea7ab 100644
--- a/homedecor/textures/homedecor_washing_machine_bottom.png
+++ b/homedecor_laundry/textures/homedecor_washing_machine_bottom.png
diff --git a/homedecor/textures/homedecor_washing_machine_front.png b/homedecor_laundry/textures/homedecor_washing_machine_front.png
index 42af474..42af474 100644
--- a/homedecor/textures/homedecor_washing_machine_front.png
+++ b/homedecor_laundry/textures/homedecor_washing_machine_front.png
diff --git a/homedecor/textures/homedecor_washing_machine_sides.png b/homedecor_laundry/textures/homedecor_washing_machine_sides.png
index e52d5e3..e52d5e3 100644
--- a/homedecor/textures/homedecor_washing_machine_sides.png
+++ b/homedecor_laundry/textures/homedecor_washing_machine_sides.png
diff --git a/homedecor/textures/homedecor_washing_machine_top.png b/homedecor_laundry/textures/homedecor_washing_machine_top.png
index 8fb23ac..8fb23ac 100644
--- a/homedecor/textures/homedecor_washing_machine_top.png
+++ b/homedecor_laundry/textures/homedecor_washing_machine_top.png
diff --git a/homedecor_lighting/depends.txt b/homedecor_lighting/depends.txt
new file mode 100644
index 0000000..67304af
--- /dev/null
+++ b/homedecor_lighting/depends.txt
@@ -0,0 +1,8 @@
+homedecor_common
+default
+basic_materials
+unifieddyes
+creative
+moreblocks?
+building_blocks?
+darkage?
diff --git a/homedecor/lighting.lua b/homedecor_lighting/init.lua
index 67c54d6..e5e0df7 100644
--- a/homedecor/lighting.lua
+++ b/homedecor_lighting/init.lua
@@ -1,6 +1,6 @@
 -- This file supplies glowlights
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local glowlight_nodebox = {
 	half = homedecor.nodebox.slab_y(1/2),
@@ -11,7 +11,7 @@ local glowlight_nodebox = {
 	},
 }
 
-minetest.register_node("homedecor:glowlight_half", {
+minetest.register_node(":homedecor:glowlight_half", {
 	description = S("Thick Glowlight"),
 	tiles = {
 		"homedecor_glowlight_top.png",
@@ -49,7 +49,7 @@ minetest.register_node("homedecor:glowlight_half", {
 	end,
 })
 
-minetest.register_node("homedecor:glowlight_quarter", {
+minetest.register_node(":homedecor:glowlight_quarter", {
 	description = S("Thin Glowlight"),
 	tiles = {
 		"homedecor_glowlight_top.png",
@@ -87,7 +87,7 @@ minetest.register_node("homedecor:glowlight_quarter", {
 	end,
 })
 
-minetest.register_node("homedecor:glowlight_small_cube", {
+minetest.register_node(":homedecor:glowlight_small_cube", {
 	description = S("Small Glowlight Cube"),
 	tiles = {
 		"homedecor_glowlight_cube_tb.png",
@@ -602,7 +602,7 @@ for _, power in ipairs(lamp_power) do
 end
 
 minetest.register_lbm({
-	name = "homedecor:convert_lighting",
+	name = ":homedecor:convert_lighting",
 	label = "Convert homedecor glowlights, table lamps, and standing lamps to use param2 color",
 	run_at_every_load = false,
 	nodenames = homedecor.old_static_nodes,
@@ -707,7 +707,7 @@ homedecor.old_static_desk_lamps = {
 }
 
 minetest.register_lbm({
-	name = "homedecor:convert_desk_lamps",
+	name = ":homedecor:convert_desk_lamps",
 	label = "Convert homedecor desk lamps to use param2 color",
 	run_at_every_load = false,
 	nodenames = homedecor.old_static_desk_lamps,
@@ -756,7 +756,7 @@ local topchains_sbox = {
 	}
 }
 
-minetest.register_node("homedecor:chain_steel_top", {
+minetest.register_node(":homedecor:chain_steel_top", {
 	description = S("Hanging chain (ceiling mount, steel)"),
 	drawtype = "mesh",
 	mesh = "homedecor_chains_top.obj",
@@ -770,7 +770,7 @@ minetest.register_node("homedecor:chain_steel_top", {
 	selection_box = topchains_sbox,
 })
 
-minetest.register_node("homedecor:chain_brass_top", {
+minetest.register_node(":homedecor:chain_brass_top", {
 	description = S("Hanging chain (ceiling mount, brass)"),
 	drawtype = "mesh",
 	mesh = "homedecor_chains_top.obj",
@@ -784,7 +784,7 @@ minetest.register_node("homedecor:chain_brass_top", {
 	selection_box = topchains_sbox,
 })
 
-minetest.register_node("homedecor:chandelier_steel", {
+minetest.register_node(":homedecor:chandelier_steel", {
 	description = S("Chandelier (steel)"),
 	paramtype = "light",
 	light_source = 12,
@@ -810,7 +810,7 @@ minetest.register_node("homedecor:chandelier_steel", {
 	sounds =  default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("homedecor:chandelier_brass", {
+minetest.register_node(":homedecor:chandelier_brass", {
 	description = S("Chandelier (brass)"),
 	paramtype = "light",
 	light_source = 12,
@@ -836,7 +836,7 @@ minetest.register_node("homedecor:chandelier_brass", {
 	sounds =  default.node_sound_stone_defaults(),
 })
 
--- crafts
+-- crafting
 
 minetest.register_craft({
 	output = 'homedecor:chain_steel_top',
@@ -874,6 +874,322 @@ minetest.register_craft({
 	}
 })
 
+-- candles
+
+minetest.register_craft({
+	output = "homedecor:candle_thin 4",
+	recipe = {
+		{"farming:string" },
+		{"basic_materials:paraffin" }
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:candle 2",
+	recipe = {
+		{"farming:string" },
+		{"basic_materials:paraffin" },
+		{"basic_materials:paraffin" }
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:wall_sconce 2",
+	recipe = {
+		{"default:iron_lump", "", ""},
+		{"default:iron_lump", "homedecor:candle", ""},
+		{"default:iron_lump", "", ""},
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:candlestick_wrought_iron",
+	recipe = {
+		{""},
+		{"homedecor:candle_thin"},
+		{"default:iron_lump"},
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:candlestick_brass",
+	recipe = {
+		{""},
+		{"homedecor:candle_thin"},
+		{"basic_materials:brass_ingot"},
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:oil_lamp",
+	recipe = {
+		{ "", "vessels:glass_bottle", "" },
+		{ "", "farming:string", "" },
+		{ "default:steel_ingot", "basic_materials:oil_extract", "default:steel_ingot" }
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:oil_lamp_tabletop",
+	recipe = {
+		{ "", "vessels:glass_bottle", "" },
+		{ "", "farming:string", "" },
+		{ "default:iron_lump", "basic_materials:oil_extract", "default:iron_lump" }
+	}
+})
+
+-- Wrought-iron wall latern
+
+minetest.register_craft({
+	output = "homedecor:ground_lantern",
+	recipe = {
+		{ "default:iron_lump", "default:iron_lump", "default:iron_lump" },
+		{ "default:iron_lump", "default:torch", "default:iron_lump" },
+		{ "", "default:iron_lump", "" }
+	}
+})
+
+-- wood-lattice lamps
+
+if minetest.get_modpath("darkage") then
+	minetest.register_craft( {
+		output = "homedecor:lattice_lantern_small 8",
+		recipe = {
+			{ "darkage:lamp" },
+		},
+	})
+
+	minetest.register_craft( {
+		output = "darkage:lamp",
+		type = "shapeless",
+		recipe = {
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+		},
+	})
+else
+	minetest.register_craft( {
+			output = "homedecor:lattice_lantern_large 2",
+			recipe = {
+				{ "dye:black", "dye:yellow", "dye:black" },
+				{ "group:stick", "building_blocks:woodglass", "group:stick" },
+				{ "group:stick", "basic_materials:energy_crystal_simple", "group:stick" }
+			},
+	})
+
+	minetest.register_craft( {
+		output = "homedecor:lattice_lantern_small 8",
+		recipe = {
+			{ "homedecor:lattice_lantern_large" },
+		},
+	})
+
+	minetest.register_craft( {
+		output = "homedecor:lattice_lantern_large",
+		type = "shapeless",
+		recipe = {
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+			"homedecor:lattice_lantern_small",
+		},
+	})
+end
+
+-- glowlights
+
+minetest.register_craft({
+	output = "homedecor:glowlight_half 6",
+	recipe = {
+		{ "default:glass", "basic_materials:energy_crystal_simple", "default:glass", },
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:glowlight_half 6",
+        recipe = {
+		{"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", },
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:glowlight_half",
+        recipe = {
+		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"},
+		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}
+	}
+})
+
+minetest.register_craft({
+		output = "homedecor:glowlight_half",
+		type = "shapeless",
+		recipe = {
+		"homedecor:glowlight_quarter",
+		"homedecor:glowlight_quarter"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:glowlight_half",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:glowlight_half",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:glowlight_quarter 6",
+        recipe = {
+		{"homedecor:glowlight_half", "homedecor:glowlight_half", "homedecor:glowlight_half", },
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:glowlight_quarter",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:glowlight_quarter",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:glowlight_small_cube 8",
+	recipe = {
+		{ "dye:white" },
+		{ "default:glass" },
+		{ "basic_materials:energy_crystal_simple" },
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:glowlight_small_cube 8",
+        recipe = {
+		{"dye:white" },
+		{"moreblocks:super_glow_glass" },
+	}
+})
+
+minetest.register_craft({
+        output = "homedecor:glowlight_small_cube 4",
+        recipe = {
+		{"homedecor:glowlight_half" },
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:glowlight_small_cube",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:glowlight_small_cube",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+----
+
+minetest.register_craft({
+    output = "homedecor:plasma_lamp",
+    recipe = {
+		{"", "default:glass", ""},
+		{"default:glass", "basic_materials:energy_crystal_simple", "default:glass"},
+		{"", "default:glass", ""}
+	}
+})
+
+minetest.register_craft({
+    output = "homedecor:plasma_ball 2",
+    recipe = {
+		{"", "default:glass", ""},
+		{"default:glass", "default:copper_ingot", "default:glass"},
+		{"basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet"}
+	}
+})
+
+
+minetest.register_craft({
+	output = "homedecor:desk_lamp 2",
+	recipe = {
+		{ "", "default:steel_ingot", "homedecor:glowlight_small_cube" },
+		{ "", "basic_materials:steel_strip", "" },
+		{ "basic_materials:plastic_sheet", "basic_materials:copper_wire", "basic_materials:plastic_sheet" },
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:desk_lamp",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:desk_lamp",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+	output = "homedecor:hanging_lantern 2",
+	recipe = {
+		{ "default:iron_lump", "default:iron_lump", "" },
+		{ "default:iron_lump", "homedecor:lattice_lantern_large", "" },
+		{ "default:iron_lump", "", "" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:ceiling_lantern 2",
+	recipe = {
+		{ "default:iron_lump", "default:iron_lump", "default:iron_lump" },
+		{ "default:iron_lump", "homedecor:lattice_lantern_large", "default:iron_lump" },
+		{ "", "default:iron_lump", "" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:wall_lamp 2",
+	recipe = {
+		{ "", "homedecor:lattice_lantern_large", "" },
+		{ "default:iron_lump", "group:stick", "" },
+		{ "default:iron_lump", "group:stick", "" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:ceiling_lamp",
+	recipe = {
+		{ "", "basic_materials:brass_ingot", ""},
+		{ "", "basic_materials:chainlink_brass", ""},
+		{ "default:glass", "homedecor:glowlight_small_cube", "default:glass"}
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:ceiling_lamp",
+	recipe = {
+		{ "", "basic_materials:chain_steel_top_brass", ""},
+		{ "default:glass", "homedecor:glowlight_small_cube", "default:glass"}
+	},
+})
+
+-- aliases
+
 minetest.register_alias("chains:chain_top",        "homedecor:chain_steel_top")
 minetest.register_alias("chains:chain_top_brass",  "homedecor:chain_brass_top")
 
diff --git a/homedecor/models/homedecor_candle_thick.obj b/homedecor_lighting/models/homedecor_candle_thick.obj
index 8c3586a..8c3586a 100644
--- a/homedecor/models/homedecor_candle_thick.obj
+++ b/homedecor_lighting/models/homedecor_candle_thick.obj
diff --git a/homedecor/models/homedecor_candle_thin.obj b/homedecor_lighting/models/homedecor_candle_thin.obj
index 1c54f11..1c54f11 100644
--- a/homedecor/models/homedecor_candle_thin.obj
+++ b/homedecor_lighting/models/homedecor_candle_thin.obj
diff --git a/homedecor/models/homedecor_candlestick.obj b/homedecor_lighting/models/homedecor_candlestick.obj
index 2b81571..2b81571 100644
--- a/homedecor/models/homedecor_candlestick.obj
+++ b/homedecor_lighting/models/homedecor_candlestick.obj
diff --git a/homedecor/models/homedecor_ceiling_lamp.obj b/homedecor_lighting/models/homedecor_ceiling_lamp.obj
index e5587e7..e5587e7 100644
--- a/homedecor/models/homedecor_ceiling_lamp.obj
+++ b/homedecor_lighting/models/homedecor_ceiling_lamp.obj
diff --git a/homedecor/models/homedecor_ceiling_lantern.obj b/homedecor_lighting/models/homedecor_ceiling_lantern.obj
index f8f9a68..f8f9a68 100644
--- a/homedecor/models/homedecor_ceiling_lantern.obj
+++ b/homedecor_lighting/models/homedecor_ceiling_lantern.obj
diff --git a/homedecor/models/homedecor_chains_top.obj b/homedecor_lighting/models/homedecor_chains_top.obj
index 9e4f3f7..9e4f3f7 100644
--- a/homedecor/models/homedecor_chains_top.obj
+++ b/homedecor_lighting/models/homedecor_chains_top.obj
diff --git a/homedecor/models/homedecor_chandelier.obj b/homedecor_lighting/models/homedecor_chandelier.obj
index 83c609d..83c609d 100644
--- a/homedecor/models/homedecor_chandelier.obj
+++ b/homedecor_lighting/models/homedecor_chandelier.obj
diff --git a/homedecor/models/homedecor_desk_lamp.obj b/homedecor_lighting/models/homedecor_desk_lamp.obj
index 3cda1b4..3cda1b4 100644
--- a/homedecor/models/homedecor_desk_lamp.obj
+++ b/homedecor_lighting/models/homedecor_desk_lamp.obj
diff --git a/homedecor/models/homedecor_ground_lantern.obj b/homedecor_lighting/models/homedecor_ground_lantern.obj
index e1df42a..e1df42a 100644
--- a/homedecor/models/homedecor_ground_lantern.obj
+++ b/homedecor_lighting/models/homedecor_ground_lantern.obj
diff --git a/homedecor/models/homedecor_hanging_lantern.obj b/homedecor_lighting/models/homedecor_hanging_lantern.obj
index 0f731f9..0f731f9 100644
--- a/homedecor/models/homedecor_hanging_lantern.obj
+++ b/homedecor_lighting/models/homedecor_hanging_lantern.obj
diff --git a/homedecor/models/homedecor_oil_lamp.obj b/homedecor_lighting/models/homedecor_oil_lamp.obj
index 7360e27..7360e27 100644
--- a/homedecor/models/homedecor_oil_lamp.obj
+++ b/homedecor_lighting/models/homedecor_oil_lamp.obj
diff --git a/homedecor/models/homedecor_oil_lamp_tabletop.obj b/homedecor_lighting/models/homedecor_oil_lamp_tabletop.obj
index 6b48a27..6b48a27 100644
--- a/homedecor/models/homedecor_oil_lamp_tabletop.obj
+++ b/homedecor_lighting/models/homedecor_oil_lamp_tabletop.obj
diff --git a/homedecor/models/homedecor_plasma_ball.obj b/homedecor_lighting/models/homedecor_plasma_ball.obj
index 777ca11..777ca11 100644
--- a/homedecor/models/homedecor_plasma_ball.obj
+++ b/homedecor_lighting/models/homedecor_plasma_ball.obj
diff --git a/homedecor/models/homedecor_standing_lamp.obj b/homedecor_lighting/models/homedecor_standing_lamp.obj
index d450eac..d450eac 100644
--- a/homedecor/models/homedecor_standing_lamp.obj
+++ b/homedecor_lighting/models/homedecor_standing_lamp.obj
diff --git a/homedecor/models/homedecor_table_lamp.obj b/homedecor_lighting/models/homedecor_table_lamp.obj
index e59c4a1..e59c4a1 100644
--- a/homedecor/models/homedecor_table_lamp.obj
+++ b/homedecor_lighting/models/homedecor_table_lamp.obj
diff --git a/homedecor/models/homedecor_wall_sconce.obj b/homedecor_lighting/models/homedecor_wall_sconce.obj
index d0e8186..d0e8186 100644
--- a/homedecor/models/homedecor_wall_sconce.obj
+++ b/homedecor_lighting/models/homedecor_wall_sconce.obj
diff --git a/homedecor/models/plasma_lamp.obj b/homedecor_lighting/models/plasma_lamp.obj
index ffc6d93..ffc6d93 100644
--- a/homedecor/models/plasma_lamp.obj
+++ b/homedecor_lighting/models/plasma_lamp.obj
diff --git a/homedecor/textures/homedecor_candle_flame.png b/homedecor_lighting/textures/homedecor_candle_flame.png
index a34b9a5..a34b9a5 100644
--- a/homedecor/textures/homedecor_candle_flame.png
+++ b/homedecor_lighting/textures/homedecor_candle_flame.png
diff --git a/homedecor/textures/homedecor_candle_flat.png b/homedecor_lighting/textures/homedecor_candle_flat.png
index d709a8c..d709a8c 100644
--- a/homedecor/textures/homedecor_candle_flat.png
+++ b/homedecor_lighting/textures/homedecor_candle_flat.png
diff --git a/homedecor/textures/homedecor_candle_inv.png b/homedecor_lighting/textures/homedecor_candle_inv.png
index f1709ca..f1709ca 100644
--- a/homedecor/textures/homedecor_candle_inv.png
+++ b/homedecor_lighting/textures/homedecor_candle_inv.png
diff --git a/homedecor/textures/homedecor_candle_sides.png b/homedecor_lighting/textures/homedecor_candle_sides.png
index d709a8c..d709a8c 100644
--- a/homedecor/textures/homedecor_candle_sides.png
+++ b/homedecor_lighting/textures/homedecor_candle_sides.png
diff --git a/homedecor/textures/homedecor_candle_thin_inv.png b/homedecor_lighting/textures/homedecor_candle_thin_inv.png
index 2a89446..2a89446 100644
--- a/homedecor/textures/homedecor_candle_thin_inv.png
+++ b/homedecor_lighting/textures/homedecor_candle_thin_inv.png
diff --git a/homedecor/textures/homedecor_candlestick_brass_inv.png b/homedecor_lighting/textures/homedecor_candlestick_brass_inv.png
index eeae63f..eeae63f 100644
--- a/homedecor/textures/homedecor_candlestick_brass_inv.png
+++ b/homedecor_lighting/textures/homedecor_candlestick_brass_inv.png
diff --git a/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png b/homedecor_lighting/textures/homedecor_candlestick_wrought_iron_inv.png
index f87b383..f87b383 100644
--- a/homedecor/textures/homedecor_candlestick_wrought_iron_inv.png
+++ b/homedecor_lighting/textures/homedecor_candlestick_wrought_iron_inv.png
diff --git a/homedecor/textures/homedecor_ceiling_lamp_glass.png b/homedecor_lighting/textures/homedecor_ceiling_lamp_glass.png
index 410349d..410349d 100644
--- a/homedecor/textures/homedecor_ceiling_lamp_glass.png
+++ b/homedecor_lighting/textures/homedecor_ceiling_lamp_glass.png
diff --git a/homedecor/textures/homedecor_ceiling_lamp_inv.png b/homedecor_lighting/textures/homedecor_ceiling_lamp_inv.png
index 265f2c8..265f2c8 100644
--- a/homedecor/textures/homedecor_ceiling_lamp_inv.png
+++ b/homedecor_lighting/textures/homedecor_ceiling_lamp_inv.png
diff --git a/homedecor/textures/homedecor_ceiling_lantern_inv.png b/homedecor_lighting/textures/homedecor_ceiling_lantern_inv.png
index 85b2c54..85b2c54 100644
--- a/homedecor/textures/homedecor_ceiling_lantern_inv.png
+++ b/homedecor_lighting/textures/homedecor_ceiling_lantern_inv.png
diff --git a/homedecor/textures/homedecor_desk_lamp_inv.png b/homedecor_lighting/textures/homedecor_desk_lamp_inv.png
index 1806758..1806758 100644
--- a/homedecor/textures/homedecor_desk_lamp_inv.png
+++ b/homedecor_lighting/textures/homedecor_desk_lamp_inv.png
diff --git a/homedecor/textures/homedecor_glowlight_bottom.png b/homedecor_lighting/textures/homedecor_glowlight_bottom.png
index 37a6b4d..37a6b4d 100644
--- a/homedecor/textures/homedecor_glowlight_bottom.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_bottom.png
diff --git a/homedecor/textures/homedecor_glowlight_cube_sides.png b/homedecor_lighting/textures/homedecor_glowlight_cube_sides.png
index 31ba821..31ba821 100644
--- a/homedecor/textures/homedecor_glowlight_cube_sides.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_sides.png
diff --git a/homedecor/textures/homedecor_glowlight_cube_sides_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_cube_sides_overlay.png
index 0e5aefb..0e5aefb 100644
--- a/homedecor/textures/homedecor_glowlight_cube_sides_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_sides_overlay.png
diff --git a/homedecor/textures/homedecor_glowlight_cube_tb.png b/homedecor_lighting/textures/homedecor_glowlight_cube_tb.png
index c415202..c415202 100644
--- a/homedecor/textures/homedecor_glowlight_cube_tb.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_tb.png
diff --git a/homedecor/textures/homedecor_glowlight_cube_tb_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_cube_tb_overlay.png
index 03cf1dc..03cf1dc 100644
--- a/homedecor/textures/homedecor_glowlight_cube_tb_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_cube_tb_overlay.png
diff --git a/homedecor/textures/homedecor_glowlight_thick_sides.png b/homedecor_lighting/textures/homedecor_glowlight_thick_sides.png
index bae0108..bae0108 100644
--- a/homedecor/textures/homedecor_glowlight_thick_sides.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thick_sides.png
diff --git a/homedecor/textures/homedecor_glowlight_thick_sides_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_thick_sides_overlay.png
index 0d871d1..0d871d1 100644
--- a/homedecor/textures/homedecor_glowlight_thick_sides_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thick_sides_overlay.png
diff --git a/homedecor/textures/homedecor_glowlight_thin_sides.png b/homedecor_lighting/textures/homedecor_glowlight_thin_sides.png
index 51832b5..51832b5 100644
--- a/homedecor/textures/homedecor_glowlight_thin_sides.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thin_sides.png
diff --git a/homedecor/textures/homedecor_glowlight_thin_sides_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_thin_sides_overlay.png
index f9335ef..f9335ef 100644
--- a/homedecor/textures/homedecor_glowlight_thin_sides_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_thin_sides_overlay.png
diff --git a/homedecor/textures/homedecor_glowlight_top.png b/homedecor_lighting/textures/homedecor_glowlight_top.png
index 70518e7..70518e7 100644
--- a/homedecor/textures/homedecor_glowlight_top.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_top.png
diff --git a/homedecor/textures/homedecor_glowlight_top_overlay.png b/homedecor_lighting/textures/homedecor_glowlight_top_overlay.png
index 5fbf891..5fbf891 100644
--- a/homedecor/textures/homedecor_glowlight_top_overlay.png
+++ b/homedecor_lighting/textures/homedecor_glowlight_top_overlay.png
diff --git a/homedecor/textures/homedecor_ground_lantern_inv.png b/homedecor_lighting/textures/homedecor_ground_lantern_inv.png
index 3e94072..3e94072 100644
--- a/homedecor/textures/homedecor_ground_lantern_inv.png
+++ b/homedecor_lighting/textures/homedecor_ground_lantern_inv.png
diff --git a/homedecor/textures/homedecor_hanging_lantern_inv.png b/homedecor_lighting/textures/homedecor_hanging_lantern_inv.png
index a5e9a58..a5e9a58 100644
--- a/homedecor/textures/homedecor_hanging_lantern_inv.png
+++ b/homedecor_lighting/textures/homedecor_hanging_lantern_inv.png
diff --git a/homedecor/textures/homedecor_lattice_lantern_large.png b/homedecor_lighting/textures/homedecor_lattice_lantern_large.png
index ac32230..ac32230 100644
--- a/homedecor/textures/homedecor_lattice_lantern_large.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_large.png
diff --git a/homedecor/textures/homedecor_lattice_lantern_small_sides.png b/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides.png
index 48c517f..48c517f 100644
--- a/homedecor/textures/homedecor_lattice_lantern_small_sides.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_small_sides.png
diff --git a/homedecor/textures/homedecor_lattice_lantern_small_tb.png b/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb.png
index eb28a0d..eb28a0d 100644
--- a/homedecor/textures/homedecor_lattice_lantern_small_tb.png
+++ b/homedecor_lighting/textures/homedecor_lattice_lantern_small_tb.png
diff --git a/homedecor/textures/homedecor_oil_lamp_glass.png b/homedecor_lighting/textures/homedecor_oil_lamp_glass.png
index 3d78e26..3d78e26 100644
--- a/homedecor/textures/homedecor_oil_lamp_glass.png
+++ b/homedecor_lighting/textures/homedecor_oil_lamp_glass.png
diff --git a/homedecor/textures/homedecor_oil_lamp_inv.png b/homedecor_lighting/textures/homedecor_oil_lamp_inv.png
index 084d1f6..084d1f6 100644
--- a/homedecor/textures/homedecor_oil_lamp_inv.png
+++ b/homedecor_lighting/textures/homedecor_oil_lamp_inv.png
diff --git a/homedecor/textures/homedecor_oil_lamp_tabletop.png b/homedecor_lighting/textures/homedecor_oil_lamp_tabletop.png
index 2b051b9..2b051b9 100644
--- a/homedecor/textures/homedecor_oil_lamp_tabletop.png
+++ b/homedecor_lighting/textures/homedecor_oil_lamp_tabletop.png
diff --git a/homedecor/textures/homedecor_oil_lamp_tabletop_inv.png b/homedecor_lighting/textures/homedecor_oil_lamp_tabletop_inv.png
index be014c6..be014c6 100644
--- a/homedecor/textures/homedecor_oil_lamp_tabletop_inv.png
+++ b/homedecor_lighting/textures/homedecor_oil_lamp_tabletop_inv.png
diff --git a/homedecor/textures/homedecor_oil_lamp_wick.png b/homedecor_lighting/textures/homedecor_oil_lamp_wick.png
index a888d61..a888d61 100644
--- a/homedecor/textures/homedecor_oil_lamp_wick.png
+++ b/homedecor_lighting/textures/homedecor_oil_lamp_wick.png
diff --git a/homedecor/textures/homedecor_plasma_ball_glass.png b/homedecor_lighting/textures/homedecor_plasma_ball_glass.png
index 91f160e..91f160e 100644
--- a/homedecor/textures/homedecor_plasma_ball_glass.png
+++ b/homedecor_lighting/textures/homedecor_plasma_ball_glass.png
diff --git a/homedecor/textures/homedecor_plasma_ball_inv.png b/homedecor_lighting/textures/homedecor_plasma_ball_inv.png
index 8ca81fd..8ca81fd 100644
--- a/homedecor/textures/homedecor_plasma_ball_inv.png
+++ b/homedecor_lighting/textures/homedecor_plasma_ball_inv.png
diff --git a/homedecor/textures/homedecor_plasma_ball_streamers.png b/homedecor_lighting/textures/homedecor_plasma_ball_streamers.png
index 206f7f7..206f7f7 100644
--- a/homedecor/textures/homedecor_plasma_ball_streamers.png
+++ b/homedecor_lighting/textures/homedecor_plasma_ball_streamers.png
diff --git a/homedecor/textures/homedecor_plasma_storm.png b/homedecor_lighting/textures/homedecor_plasma_storm.png
index 42b7ca4..42b7ca4 100644
--- a/homedecor/textures/homedecor_plasma_storm.png
+++ b/homedecor_lighting/textures/homedecor_plasma_storm.png
diff --git a/homedecor/textures/homedecor_standing_lamp_foot_inv.png b/homedecor_lighting/textures/homedecor_standing_lamp_foot_inv.png
index 8efd5ba..8efd5ba 100644
--- a/homedecor/textures/homedecor_standing_lamp_foot_inv.png
+++ b/homedecor_lighting/textures/homedecor_standing_lamp_foot_inv.png
diff --git a/homedecor/textures/homedecor_standing_lamp_top_inv.png b/homedecor_lighting/textures/homedecor_standing_lamp_top_inv.png
index 216df54..216df54 100644
--- a/homedecor/textures/homedecor_standing_lamp_top_inv.png
+++ b/homedecor_lighting/textures/homedecor_standing_lamp_top_inv.png
diff --git a/homedecor/textures/homedecor_table_lamp_foot_inv.png b/homedecor_lighting/textures/homedecor_table_lamp_foot_inv.png
index eb29b0c..eb29b0c 100644
--- a/homedecor/textures/homedecor_table_lamp_foot_inv.png
+++ b/homedecor_lighting/textures/homedecor_table_lamp_foot_inv.png
diff --git a/homedecor/textures/homedecor_table_lamp_top_inv.png b/homedecor_lighting/textures/homedecor_table_lamp_top_inv.png
index c48029e..c48029e 100644
--- a/homedecor/textures/homedecor_table_lamp_top_inv.png
+++ b/homedecor_lighting/textures/homedecor_table_lamp_top_inv.png
diff --git a/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png b/homedecor_lighting/textures/homedecor_table_standing_lamp_lightbulb.png
index cd93c8f..cd93c8f 100644
--- a/homedecor/textures/homedecor_table_standing_lamp_lightbulb.png
+++ b/homedecor_lighting/textures/homedecor_table_standing_lamp_lightbulb.png
diff --git a/homedecor/textures/homedecor_wall_sconce_back.png b/homedecor_lighting/textures/homedecor_wall_sconce_back.png
index 292433d..292433d 100644
--- a/homedecor/textures/homedecor_wall_sconce_back.png
+++ b/homedecor_lighting/textures/homedecor_wall_sconce_back.png
diff --git a/homedecor/textures/homedecor_wall_sconce_inv.png b/homedecor_lighting/textures/homedecor_wall_sconce_inv.png
index cab4269..cab4269 100644
--- a/homedecor/textures/homedecor_wall_sconce_inv.png
+++ b/homedecor_lighting/textures/homedecor_wall_sconce_inv.png
diff --git a/homedecor_misc/depends.txt b/homedecor_misc/depends.txt
new file mode 100644
index 0000000..92ae6dc
--- /dev/null
+++ b/homedecor_misc/depends.txt
@@ -0,0 +1,7 @@
+homedecor_common
+default
+basic_materials
+unifieddyes
+building_blocks?
+technic?
+bucket?
diff --git a/homedecor/misc-nodes.lua b/homedecor_misc/init.lua
index 9be77cb..afeee27 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor_misc/init.lua
@@ -1,7 +1,13 @@
+-- Home Decor mod by VanessaE
+--
+-- Mostly my own code, with bits and pieces lifted from Minetest's default
+-- lua files and from ironzorg's flowers mod.  Many thanks to GloopMaster
+-- for helping me figure out the inventories used in the nightstands/dressers.
+--
+-- The code for ovens, nightstands, refrigerators are basically modified
+-- copies of the code for chests and furnaces.
 
-local S = homedecor_i18n.gettext
-
-local function N_(x) return x end
+local S = homedecor.gettext
 
 homedecor.register("ceiling_paint", {
 	description = S("Textured Ceiling Paint"),
@@ -28,9 +34,9 @@ homedecor.register("ceiling_tile", {
 })
 
 local rug_types = {
-	{ N_("small"),   "homedecor_small_rug.obj"    },
-	{ N_("large"),   homedecor.box.slab_y(0.0625) },
-	{ N_("persian"), homedecor.box.slab_y(0.0625) },
+	{ "small",   "homedecor_small_rug.obj"    },
+	{ "large",   homedecor.box.slab_y(0.0625) },
+	{ "persian", homedecor.box.slab_y(0.0625) },
 }
 
 for _, rt in ipairs(rug_types) do
@@ -66,7 +72,7 @@ for _, rt in ipairs(rug_types) do
 	})
 end
 
-local pot_colors = { N_("black"), N_("green"), N_("terracotta") }
+local pot_colors = { "black", "green", "terracotta" }
 
 for _, p in ipairs(pot_colors) do
 homedecor.register("flower_pot_"..p, {
@@ -388,53 +394,6 @@ homedecor.register("tool_cabinet", {
 minetest.register_alias("homedecor:tool_cabinet_bottom", "homedecor:tool_cabinet")
 minetest.register_alias("homedecor:tool_cabinet_top", "air")
 
-local pframe_cbox = {
-	type = "fixed",
-	fixed = { -0.18, -0.5, -0.08, 0.18, -0.08, 0.18 }
-}
-local n = { 1, 2 }
-
-for _, i in ipairs(n) do
-	homedecor.register("picture_frame"..i, {
-		description = S("Picture Frame "..i),
-		mesh = "homedecor_picture_frame.obj",
-		tiles = {
-			"homedecor_picture_frame_image"..i..".png",
-			homedecor.lux_wood,
-			"homedecor_picture_frame_back.png",
-		},
-		inventory_image = "homedecor_picture_frame"..i.."_inv.png",
-		wield_image = "homedecor_picture_frame"..i.."_inv.png",
-		groups = {snappy = 3},
-		selection_box = pframe_cbox,
-		walkable = false,
-		sounds = default.node_sound_glass_defaults()
-	})
-end
-
-local p_cbox = {
-	type = "fixed",
-	fixed = {
-		{ -0.5, -0.5, 0.4375, 0.5, 0.5, 0.5 }
-	}
-}
-
-for i = 1,20 do
-	homedecor.register("painting_"..i, {
-		description = S("Decorative painting #@1", i),
-		mesh = "homedecor_painting.obj",
-		tiles = {
-			"default_wood.png",
-			"homedecor_blank_canvas.png",
-			"homedecor_painting"..i..".png"
-		},
-		selection_box = p_cbox,
-		walkable = false,
-		groups = {snappy=3},
-		sounds = default.node_sound_wood_defaults(),
-	})
-end
-
 homedecor.banister_materials = {
 	{	"wood",
 		S("wood"),
@@ -511,7 +470,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 		}
 
 		if side ~= "horizontal" then
-			def.groups.not_in_creative_inventory = 1 
+			def.groups.not_in_creative_inventory = 1
 		end
 
 		if name == "wood" then
@@ -530,7 +489,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 				homedecor.white_wood
 			}
 			def2.inventory_image = "homedecor_banister_wood_colored_inv.png"
-			def2.groups.not_in_creative_inventory = 1 
+			def2.groups.not_in_creative_inventory = 1
 
 			unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal")
 		end
@@ -627,3 +586,416 @@ minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack
 		end
 	end
 end)
+
+minetest.register_node(":homedecor:tatami_mat", {
+	tiles = {
+		"homedecor_tatami.png",
+		"homedecor_tatami.png",
+		"homedecor_tatami.png",
+		"homedecor_tatami.png",
+		"homedecor_tatami.png",
+		"homedecor_tatami.png"
+	},
+	description = S("Japanese tatami"),
+	drawtype = "nodebox",
+	paramtype = "light",
+	groups = {snappy=3},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
+		}
+	}
+})
+
+homedecor.register("dartboard", {
+	description = S("Dartboard"),
+	mesh = "homedecor_dartboard.obj",
+	tiles = { "homedecor_dartboard.png" },
+	inventory_image = "homedecor_dartboard_inv.png",
+	wield_image = "homedecor_dartboard_inv.png",
+	paramtype2 = "wallmounted",
+	walkable = false,
+	selection_box = {
+		type = "wallmounted",
+	},
+	groups = {choppy=2,dig_immediate=2,attached_node=1},
+	legacy_wallmounted = true,
+	sounds = default.node_sound_wood_defaults(),
+})
+
+-- crafting
+
+-- Crafting for homedecor mod (includes folding) by Vanessa Ezekowitz
+--
+-- Mostly my own code; overall template borrowed from game default
+
+local S = homedecor.gettext
+
+minetest.register_craft( {
+        output = "homedecor:flower_pot_terracotta",
+        recipe = {
+                { "homedecor:roof_tile_terracotta", "default:dirt", "homedecor:roof_tile_terracotta" },
+                { "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta", "homedecor:roof_tile_terracotta" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:flower_pot_green",
+        recipe = {
+                { "", "dye:dark_green", "" },
+                { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" },
+                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:flower_pot_black",
+        recipe = {
+                { "dye:black", "dye:black", "dye:black" },
+                { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" },
+                { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:ceiling_paint 20",
+        recipe = {
+                "dye:white",
+                "dye:white",
+                "default:sand",
+		"bucket:bucket_water",
+        },
+	replacements = { { "bucket:bucket_water","bucket:bucket_empty" } }
+})
+
+minetest.register_craft( {
+        output = "homedecor:ceiling_tile 10",
+        recipe = {
+                { "", "dye:white", "" },
+                { "default:steel_ingot", "default:stone", "default:steel_ingot" },
+
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:drawer_small",
+        recipe = {
+                { "group:wood", "default:steel_ingot", "group:wood" },
+        },
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:drawer_small",
+        burntime = 30,
+})
+
+-- vertical poles/lampposts
+
+minetest.register_craft( {
+        output = "homedecor:pole_brass 4",
+	recipe = {
+		{ "", "basic_materials:brass_ingot", "" },
+		{ "", "basic_materials:brass_ingot", "" },
+		{ "", "basic_materials:brass_ingot", "" }
+	},
+})
+
+minetest.register_craft( {
+        output = "homedecor:pole_wrought_iron 4",
+        recipe = {
+                { "default:iron_lump", },
+                { "default:iron_lump", },
+                { "default:iron_lump", },
+        },
+})
+
+-- ===========================================================
+-- Recipes that require materials from wool (cotton alternate)
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:rug_small 8",
+	recipe = {
+			"wool:red",
+			"wool:yellow",
+			"wool:blue",
+			"wool:black"
+	},
+})
+
+minetest.register_craft( {
+	output = "homedecor:rug_persian 8",
+	recipe = {
+		{ "", "wool:yellow", "" },
+		{ "wool:red", "wool:blue", "wool:red" },
+		{ "", "wool:yellow", "" }
+	},
+})
+
+-- cotton versions:
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:rug_small 8",
+	recipe = {
+			"cotton:red",
+			"cotton:yellow",
+			"cotton:blue",
+			"cotton:black"
+	},
+})
+
+minetest.register_craft( {
+	output = "homedecor:rug_persian 8",
+	recipe = {
+		{ "", "cotton:yellow", "" },
+		{ "cotton:red", "cotton:blue", "cotton:red" },
+		{ "", "cotton:yellow", "" }
+	},
+})
+
+-- fuel recipes for same
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:rug_small",
+	burntime = 30,
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:rug_large 2",
+	recipe = {
+		"homedecor:rug_small",
+		"homedecor:rug_small",
+	},
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:rug_large",
+	burntime = 30,
+})
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "homedecor:rug_persian",
+	burntime = 30,
+})
+
+-- more misc stuff here
+
+minetest.register_craft({
+        output = "homedecor:fishtank",
+        recipe = {
+			{ "basic_materials:plastic_sheet", "homedecor:glowlight_small_cube", "basic_materials:plastic_sheet" },
+			{ "default:glass", "bucket:bucket_water", "default:glass" },
+			{ "default:glass", "building_blocks:gravel_spread", "default:glass" },
+        },
+	replacements = { {"bucket:bucket_water", "bucket:bucket_empty"} }
+})
+
+minetest.register_craft({
+    output = "homedecor:cardboard_box 2",
+    recipe = {
+		{ "default:paper", "", "default:paper" },
+		{ "default:paper", "default:paper", "default:paper" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:cardboard_box_big 2",
+    recipe = {
+		{ "default:paper", "", "default:paper" },
+		{ "default:paper", "", "default:paper" },
+		{ "default:paper", "default:paper", "default:paper" },
+    },
+})
+
+minetest.register_craft( {
+        output = "homedecor:openframe_bookshelf",
+        recipe = {
+			{"group:wood", "", "group:wood"},
+			{"default:book", "default:book", "default:book"},
+			{"group:wood", "", "group:wood"},
+        },
+})
+
+-- japanese walls and mat
+
+minetest.register_craft( {
+        output = "homedecor:japanese_wall_top",
+        recipe = {
+			{"group:stick", "default:paper"},
+			{"default:paper", "group:stick"},
+			{"group:stick", "default:paper"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:japanese_wall_top",
+        recipe = {
+			{"default:paper", "group:stick"},
+			{"group:stick", "default:paper"},
+			{"default:paper", "group:stick"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:japanese_wall_middle",
+        recipe = {
+			{"homedecor:japanese_wall_top"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:japanese_wall_bottom",
+        recipe = {
+			{"homedecor:japanese_wall_middle"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:japanese_wall_top",
+        recipe = {
+			{"homedecor:japanese_wall_bottom"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:tatami_mat",
+        recipe = {
+			{"farming:wheat", "farming:wheat", "farming:wheat"}
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:pool_table",
+        recipe = {
+			{ "wool:dark_green", "wool:dark_green", "wool:dark_green" },
+			{ "building_blocks:hardwood", "building_blocks:hardwood", "building_blocks:hardwood" },
+			{ "building_blocks:slab_hardwood", "", "building_blocks:slab_hardwood" }
+        },
+})
+
+minetest.register_craft({
+	output = "homedecor:dartboard",
+	recipe = {
+	    {"dye:black", "basic_materials:plastic_sheet", "dye:white"},
+	    {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"},
+	    {"dye:dark_green", "basic_materials:plastic_sheet", "dye:red"}
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:piano",
+	recipe = {
+		{ "", "basic_materials:steel_wire", "building_blocks:hardwood" },
+		{ "basic_materials:plastic_strip", "basic_materials:steel_wire", "building_blocks:hardwood" },
+		{ "basic_materials:brass_ingot", "default:steelblock", "building_blocks:hardwood" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:wall_shelf 2",
+	recipe = {
+		{ "homedecor:wood_table_small_square", "homedecor:curtainrod_wood", "homedecor:curtainrod_wood" },
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:trophy 3",
+	recipe = {
+		{ "default:gold_ingot","","default:gold_ingot" },
+		{ "","default:gold_ingot","" },
+		{ "group:wood","default:gold_ingot","group:wood" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:sportbench",
+	recipe = {
+		{ "stairs:slab_steelblock","homedecor:pole_wrought_iron","stairs:slab_steelblock" },
+		{ "default:steel_ingot","wool:black","default:steel_ingot" },
+		{ "default:steel_ingot","wool:black","default:steel_ingot" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:skateboard",
+	recipe = {
+		{ "dye:yellow","dye:green","dye:blue" },
+		{ "homedecor:wood_table_small_square","homedecor:wood_table_small_square","homedecor:wood_table_small_square" },
+		{ "default:steel_ingot","","default:steel_ingot" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:tool_cabinet",
+	recipe = {
+		{ "basic_materials:motor", "default:axe_steel", "default:pick_steel" },
+		{ "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" },
+		{ "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:spiral_staircase",
+	recipe = {
+		{ "default:steelblock", "homedecor:pole_wrought_iron", "" },
+		{ "", "homedecor:pole_wrought_iron", "default:steelblock" },
+		{ "default:steelblock", "homedecor:pole_wrought_iron", "" }
+	},
+})
+
+minetest.register_craftitem(":homedecor:flower_pot_small", {
+	description = S("Small Flower Pot"),
+	inventory_image = "homedecor_flowerpot_small_inv.png"
+})
+
+minetest.register_craft( {
+	output = "homedecor:flower_pot_small",
+	recipe = {
+	        { "default:clay_brick", "", "default:clay_brick" },
+	        { "", "default:clay_brick", "" }
+	}
+})
+
+minetest.register_craft( {
+	output = "homedecor:flower_pot_small 3",
+	recipe = { { "homedecor:flower_pot_terracotta" } }
+})
+
+for i in ipairs(homedecor.banister_materials) do
+
+	local name    = homedecor.banister_materials[i][1]
+	local topmat  = homedecor.banister_materials[i][5]
+	local vertmat = homedecor.banister_materials[i][6]
+	local dye1    = homedecor.banister_materials[i][7]
+	local dye2    = homedecor.banister_materials[i][8]
+
+	minetest.register_craft({
+		output = "homedecor:banister_"..name.."_horizontal 2",
+		recipe = {
+			{ topmat,  "",      dye1   },
+			{ vertmat, topmat,  ""     },
+			{ dye2,    vertmat, topmat }
+		},
+	})
+end
+
+unifieddyes.register_color_craft({
+	output = "",
+	palette = "split",
+	neutral_node = "homedecor:banister_wood_horizontal",
+	type = "shapeless",
+	output_prefix = "homedecor:banister_wood_horizontal_",
+	output_suffix = "",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE",
+	}
+})
diff --git a/homedecor/models/homedecor_banister_diagonal_left.obj b/homedecor_misc/models/homedecor_banister_diagonal_left.obj
index 1a2fcc0..1a2fcc0 100644
--- a/homedecor/models/homedecor_banister_diagonal_left.obj
+++ b/homedecor_misc/models/homedecor_banister_diagonal_left.obj
diff --git a/homedecor/models/homedecor_banister_diagonal_right.obj b/homedecor_misc/models/homedecor_banister_diagonal_right.obj
index 443aa42..443aa42 100644
--- a/homedecor/models/homedecor_banister_diagonal_right.obj
+++ b/homedecor_misc/models/homedecor_banister_diagonal_right.obj
diff --git a/homedecor/models/homedecor_banister_horizontal.obj b/homedecor_misc/models/homedecor_banister_horizontal.obj
index 7784e99..7784e99 100644
--- a/homedecor/models/homedecor_banister_horizontal.obj
+++ b/homedecor_misc/models/homedecor_banister_horizontal.obj
diff --git a/homedecor/models/homedecor_dartboard.obj b/homedecor_misc/models/homedecor_dartboard.obj
index 08060cf..08060cf 100644
--- a/homedecor/models/homedecor_dartboard.obj
+++ b/homedecor_misc/models/homedecor_dartboard.obj
diff --git a/homedecor/models/homedecor_dvd_cabinet.obj b/homedecor_misc/models/homedecor_dvd_cabinet.obj
index 09fc292..09fc292 100644
--- a/homedecor/models/homedecor_dvd_cabinet.obj
+++ b/homedecor_misc/models/homedecor_dvd_cabinet.obj
diff --git a/homedecor/models/homedecor_fishtank.obj b/homedecor_misc/models/homedecor_fishtank.obj
index 0f7327b..0f7327b 100644
--- a/homedecor/models/homedecor_fishtank.obj
+++ b/homedecor_misc/models/homedecor_fishtank.obj
diff --git a/homedecor/models/homedecor_flowerpot.obj b/homedecor_misc/models/homedecor_flowerpot.obj
index bfa316d..bfa316d 100644
--- a/homedecor/models/homedecor_flowerpot.obj
+++ b/homedecor_misc/models/homedecor_flowerpot.obj
diff --git a/homedecor/models/homedecor_piano.obj b/homedecor_misc/models/homedecor_piano.obj
index 5441f0c..5441f0c 100644
--- a/homedecor/models/homedecor_piano.obj
+++ b/homedecor_misc/models/homedecor_piano.obj
diff --git a/homedecor/models/homedecor_pool_table.obj b/homedecor_misc/models/homedecor_pool_table.obj
index 031d230..031d230 100644
--- a/homedecor/models/homedecor_pool_table.obj
+++ b/homedecor_misc/models/homedecor_pool_table.obj
diff --git a/homedecor/models/homedecor_potted_plant.obj b/homedecor_misc/models/homedecor_potted_plant.obj
index 4e57966..4e57966 100644
--- a/homedecor/models/homedecor_potted_plant.obj
+++ b/homedecor_misc/models/homedecor_potted_plant.obj
diff --git a/homedecor/models/homedecor_round_pole.obj b/homedecor_misc/models/homedecor_round_pole.obj
index e842398..e842398 100644
--- a/homedecor/models/homedecor_round_pole.obj
+++ b/homedecor_misc/models/homedecor_round_pole.obj
diff --git a/homedecor/models/homedecor_skateboard.obj b/homedecor_misc/models/homedecor_skateboard.obj
index 3c342bb..3c342bb 100644
--- a/homedecor/models/homedecor_skateboard.obj
+++ b/homedecor_misc/models/homedecor_skateboard.obj
diff --git a/homedecor/models/homedecor_small_rug.obj b/homedecor_misc/models/homedecor_small_rug.obj
index 16c689f..16c689f 100644
--- a/homedecor/models/homedecor_small_rug.obj
+++ b/homedecor_misc/models/homedecor_small_rug.obj
diff --git a/homedecor/models/homedecor_spiral_staircase.obj b/homedecor_misc/models/homedecor_spiral_staircase.obj
index f729f65..f729f65 100644
--- a/homedecor/models/homedecor_spiral_staircase.obj
+++ b/homedecor_misc/models/homedecor_spiral_staircase.obj
diff --git a/homedecor/models/homedecor_sport_bench.obj b/homedecor_misc/models/homedecor_sport_bench.obj
index d6648ce..d6648ce 100644
--- a/homedecor/models/homedecor_sport_bench.obj
+++ b/homedecor_misc/models/homedecor_sport_bench.obj
diff --git a/homedecor/models/homedecor_tool_cabinet.obj b/homedecor_misc/models/homedecor_tool_cabinet.obj
index 6dc379c..6dc379c 100644
--- a/homedecor/models/homedecor_tool_cabinet.obj
+++ b/homedecor_misc/models/homedecor_tool_cabinet.obj
diff --git a/homedecor/models/homedecor_trophy.obj b/homedecor_misc/models/homedecor_trophy.obj
index 80ea19c..80ea19c 100644
--- a/homedecor/models/homedecor_trophy.obj
+++ b/homedecor_misc/models/homedecor_trophy.obj
diff --git a/homedecor/sounds/homedecor_book_close.ogg b/homedecor_misc/sounds/homedecor_book_close.ogg
index 22116a3..22116a3 100644
--- a/homedecor/sounds/homedecor_book_close.ogg
+++ b/homedecor_misc/sounds/homedecor_book_close.ogg
diff --git a/homedecor/sounds/homedecor_door_close.ogg b/homedecor_misc/sounds/homedecor_door_close.ogg
index c85b915..c85b915 100644
--- a/homedecor/sounds/homedecor_door_close.ogg
+++ b/homedecor_misc/sounds/homedecor_door_close.ogg
diff --git a/homedecor/sounds/homedecor_door_open.ogg b/homedecor_misc/sounds/homedecor_door_open.ogg
index 16198d9..16198d9 100644
--- a/homedecor/sounds/homedecor_door_open.ogg
+++ b/homedecor_misc/sounds/homedecor_door_open.ogg
diff --git a/homedecor/sounds/homedecor_faucet.ogg b/homedecor_misc/sounds/homedecor_faucet.ogg
index 8c79074..8c79074 100644
--- a/homedecor/sounds/homedecor_faucet.ogg
+++ b/homedecor_misc/sounds/homedecor_faucet.ogg
diff --git a/homedecor/sounds/homedecor_gate_open_close.ogg b/homedecor_misc/sounds/homedecor_gate_open_close.ogg
index d5f1d96..d5f1d96 100644
--- a/homedecor/sounds/homedecor_gate_open_close.ogg
+++ b/homedecor_misc/sounds/homedecor_gate_open_close.ogg
diff --git a/homedecor/sounds/homedecor_shower.ogg b/homedecor_misc/sounds/homedecor_shower.ogg
index 4675b79..4675b79 100644
--- a/homedecor/sounds/homedecor_shower.ogg
+++ b/homedecor_misc/sounds/homedecor_shower.ogg
diff --git a/homedecor/sounds/homedecor_toilet_flush.ogg b/homedecor_misc/sounds/homedecor_toilet_flush.ogg
index e15a583..e15a583 100644
--- a/homedecor/sounds/homedecor_toilet_flush.ogg
+++ b/homedecor_misc/sounds/homedecor_toilet_flush.ogg
diff --git a/homedecor/sounds/homedecor_trash_all.ogg b/homedecor_misc/sounds/homedecor_trash_all.ogg
index 85c3f66..85c3f66 100644
--- a/homedecor/sounds/homedecor_trash_all.ogg
+++ b/homedecor_misc/sounds/homedecor_trash_all.ogg
diff --git a/homedecor/sounds/insert_coin.ogg b/homedecor_misc/sounds/insert_coin.ogg
index 2ee99d5..2ee99d5 100644
--- a/homedecor/sounds/insert_coin.ogg
+++ b/homedecor_misc/sounds/insert_coin.ogg
diff --git a/homedecor/sounds/toaster.ogg b/homedecor_misc/sounds/toaster.ogg
index c3d5a80..c3d5a80 100644
--- a/homedecor/sounds/toaster.ogg
+++ b/homedecor_misc/sounds/toaster.ogg
diff --git a/homedecor/textures/flowers_bonsai.png b/homedecor_misc/textures/flowers_bonsai.png
index bdc95ee..bdc95ee 100644
--- a/homedecor/textures/flowers_bonsai.png
+++ b/homedecor_misc/textures/flowers_bonsai.png
diff --git a/homedecor/textures/flowers_cactus.png b/homedecor_misc/textures/flowers_cactus.png
index e3c03da..e3c03da 100644
--- a/homedecor/textures/flowers_cactus.png
+++ b/homedecor_misc/textures/flowers_cactus.png
diff --git a/homedecor/textures/homedecor_banister_brass_inv.png b/homedecor_misc/textures/homedecor_banister_brass_inv.png
index 03e70df..03e70df 100644
--- a/homedecor/textures/homedecor_banister_brass_inv.png
+++ b/homedecor_misc/textures/homedecor_banister_brass_inv.png
diff --git a/homedecor/textures/homedecor_banister_white_dark_inv.png b/homedecor_misc/textures/homedecor_banister_white_dark_inv.png
index c650a95..c650a95 100644
--- a/homedecor/textures/homedecor_banister_white_dark_inv.png
+++ b/homedecor_misc/textures/homedecor_banister_white_dark_inv.png
diff --git a/homedecor/textures/homedecor_banister_wood_colored_inv.png b/homedecor_misc/textures/homedecor_banister_wood_colored_inv.png
index 5c1a7ee..5c1a7ee 100644
--- a/homedecor/textures/homedecor_banister_wood_colored_inv.png
+++ b/homedecor_misc/textures/homedecor_banister_wood_colored_inv.png
diff --git a/homedecor/textures/homedecor_banister_wood_inv.png b/homedecor_misc/textures/homedecor_banister_wood_inv.png
index 06531e5..06531e5 100644
--- a/homedecor/textures/homedecor_banister_wood_inv.png
+++ b/homedecor_misc/textures/homedecor_banister_wood_inv.png
diff --git a/homedecor/textures/homedecor_banister_wrought_iron_inv.png b/homedecor_misc/textures/homedecor_banister_wrought_iron_inv.png
index 452932f..452932f 100644
--- a/homedecor/textures/homedecor_banister_wrought_iron_inv.png
+++ b/homedecor_misc/textures/homedecor_banister_wrought_iron_inv.png
diff --git a/homedecor/textures/homedecor_cardbox_big_sides.png b/homedecor_misc/textures/homedecor_cardbox_big_sides.png
index 67fb05e..67fb05e 100644
--- a/homedecor/textures/homedecor_cardbox_big_sides.png
+++ b/homedecor_misc/textures/homedecor_cardbox_big_sides.png
diff --git a/homedecor/textures/homedecor_cardbox_big_tb.png b/homedecor_misc/textures/homedecor_cardbox_big_tb.png
index 6a57cd5..6a57cd5 100644
--- a/homedecor/textures/homedecor_cardbox_big_tb.png
+++ b/homedecor_misc/textures/homedecor_cardbox_big_tb.png
diff --git a/homedecor/textures/homedecor_cardbox_sides.png b/homedecor_misc/textures/homedecor_cardbox_sides.png
index 830bced..830bced 100644
--- a/homedecor/textures/homedecor_cardbox_sides.png
+++ b/homedecor_misc/textures/homedecor_cardbox_sides.png
diff --git a/homedecor/textures/homedecor_cardbox_tb.png b/homedecor_misc/textures/homedecor_cardbox_tb.png
index da82386..da82386 100644
--- a/homedecor/textures/homedecor_cardbox_tb.png
+++ b/homedecor_misc/textures/homedecor_cardbox_tb.png
diff --git a/homedecor/textures/homedecor_ceiling_paint.png b/homedecor_misc/textures/homedecor_ceiling_paint.png
index 305209e..305209e 100644
--- a/homedecor/textures/homedecor_ceiling_paint.png
+++ b/homedecor_misc/textures/homedecor_ceiling_paint.png
diff --git a/homedecor/textures/homedecor_ceiling_paint_roller.png b/homedecor_misc/textures/homedecor_ceiling_paint_roller.png
index cecc3bc..cecc3bc 100644
--- a/homedecor/textures/homedecor_ceiling_paint_roller.png
+++ b/homedecor_misc/textures/homedecor_ceiling_paint_roller.png
diff --git a/homedecor/textures/homedecor_ceiling_tile.png b/homedecor_misc/textures/homedecor_ceiling_tile.png
index 3e29f95..3e29f95 100644
--- a/homedecor/textures/homedecor_ceiling_tile.png
+++ b/homedecor_misc/textures/homedecor_ceiling_tile.png
diff --git a/homedecor/textures/homedecor_dartboard.png b/homedecor_misc/textures/homedecor_dartboard.png
index 91edbc0..91edbc0 100644
--- a/homedecor/textures/homedecor_dartboard.png
+++ b/homedecor_misc/textures/homedecor_dartboard.png
diff --git a/homedecor/textures/homedecor_dartboard_inv.png b/homedecor_misc/textures/homedecor_dartboard_inv.png
index 9eee775..9eee775 100644
--- a/homedecor/textures/homedecor_dartboard_inv.png
+++ b/homedecor_misc/textures/homedecor_dartboard_inv.png
diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_back.png b/homedecor_misc/textures/homedecor_dvdcd_cabinet_back.png
index 8e98d91..8e98d91 100644
--- a/homedecor/textures/homedecor_dvdcd_cabinet_back.png
+++ b/homedecor_misc/textures/homedecor_dvdcd_cabinet_back.png
diff --git a/homedecor/textures/homedecor_dvdcd_cabinet_front.png b/homedecor_misc/textures/homedecor_dvdcd_cabinet_front.png
index 642eaa9..642eaa9 100644
--- a/homedecor/textures/homedecor_dvdcd_cabinet_front.png
+++ b/homedecor_misc/textures/homedecor_dvdcd_cabinet_front.png
diff --git a/homedecor/textures/homedecor_fishtank_filter.png b/homedecor_misc/textures/homedecor_fishtank_filter.png
index 2d5b187..2d5b187 100644
--- a/homedecor/textures/homedecor_fishtank_filter.png
+++ b/homedecor_misc/textures/homedecor_fishtank_filter.png
diff --git a/homedecor/textures/homedecor_fishtank_fishes.png b/homedecor_misc/textures/homedecor_fishtank_fishes.png
index 0db50a7..0db50a7 100644
--- a/homedecor/textures/homedecor_fishtank_fishes.png
+++ b/homedecor_misc/textures/homedecor_fishtank_fishes.png
diff --git a/homedecor/textures/homedecor_fishtank_fishes_lighted.png b/homedecor_misc/textures/homedecor_fishtank_fishes_lighted.png
index baf4d88..baf4d88 100644
--- a/homedecor/textures/homedecor_fishtank_fishes_lighted.png
+++ b/homedecor_misc/textures/homedecor_fishtank_fishes_lighted.png
diff --git a/homedecor/textures/homedecor_fishtank_gravel.png b/homedecor_misc/textures/homedecor_fishtank_gravel.png
index 13249e8..13249e8 100644
--- a/homedecor/textures/homedecor_fishtank_gravel.png
+++ b/homedecor_misc/textures/homedecor_fishtank_gravel.png
diff --git a/homedecor/textures/homedecor_fishtank_gravel_lighted.png b/homedecor_misc/textures/homedecor_fishtank_gravel_lighted.png
index c17846b..c17846b 100644
--- a/homedecor/textures/homedecor_fishtank_gravel_lighted.png
+++ b/homedecor_misc/textures/homedecor_fishtank_gravel_lighted.png
diff --git a/homedecor/textures/homedecor_fishtank_sides.png b/homedecor_misc/textures/homedecor_fishtank_sides.png
index 21b02f6..21b02f6 100644
--- a/homedecor/textures/homedecor_fishtank_sides.png
+++ b/homedecor_misc/textures/homedecor_fishtank_sides.png
diff --git a/homedecor/textures/homedecor_fishtank_sides_lighted.png b/homedecor_misc/textures/homedecor_fishtank_sides_lighted.png
index 6fe49aa..6fe49aa 100644
--- a/homedecor/textures/homedecor_fishtank_sides_lighted.png
+++ b/homedecor_misc/textures/homedecor_fishtank_sides_lighted.png
diff --git a/homedecor/textures/homedecor_fishtank_water_top.png b/homedecor_misc/textures/homedecor_fishtank_water_top.png
index aac2972..aac2972 100644
--- a/homedecor/textures/homedecor_fishtank_water_top.png
+++ b/homedecor_misc/textures/homedecor_fishtank_water_top.png
diff --git a/homedecor/textures/homedecor_fishtank_water_top_lighted.png b/homedecor_misc/textures/homedecor_fishtank_water_top_lighted.png
index b69ff10..b69ff10 100644
--- a/homedecor/textures/homedecor_fishtank_water_top_lighted.png
+++ b/homedecor_misc/textures/homedecor_fishtank_water_top_lighted.png
diff --git a/homedecor/textures/homedecor_flower_pot_black.png b/homedecor_misc/textures/homedecor_flower_pot_black.png
index 612cc23..612cc23 100644
--- a/homedecor/textures/homedecor_flower_pot_black.png
+++ b/homedecor_misc/textures/homedecor_flower_pot_black.png
diff --git a/homedecor/textures/homedecor_flower_pot_green.png b/homedecor_misc/textures/homedecor_flower_pot_green.png
index d36acac..d36acac 100644
--- a/homedecor/textures/homedecor_flower_pot_green.png
+++ b/homedecor_misc/textures/homedecor_flower_pot_green.png
diff --git a/homedecor/textures/homedecor_flower_pot_terracotta.png b/homedecor_misc/textures/homedecor_flower_pot_terracotta.png
index 8468daa..8468daa 100644
--- a/homedecor/textures/homedecor_flower_pot_terracotta.png
+++ b/homedecor_misc/textures/homedecor_flower_pot_terracotta.png
diff --git a/homedecor/textures/homedecor_flowerpot_small_inv.png b/homedecor_misc/textures/homedecor_flowerpot_small_inv.png
index e28545a..e28545a 100644
--- a/homedecor/textures/homedecor_flowerpot_small_inv.png
+++ b/homedecor_misc/textures/homedecor_flowerpot_small_inv.png
diff --git a/homedecor/textures/homedecor_piano_inv.png b/homedecor_misc/textures/homedecor_piano_inv.png
index f061022..f061022 100644
--- a/homedecor/textures/homedecor_piano_inv.png
+++ b/homedecor_misc/textures/homedecor_piano_inv.png
diff --git a/homedecor/textures/homedecor_piano_keys.png b/homedecor_misc/textures/homedecor_piano_keys.png
index 6453436..6453436 100644
--- a/homedecor/textures/homedecor_piano_keys.png
+++ b/homedecor_misc/textures/homedecor_piano_keys.png
diff --git a/homedecor/textures/homedecor_pole_brass_inv.png b/homedecor_misc/textures/homedecor_pole_brass_inv.png
index cba8a3d..cba8a3d 100644
--- a/homedecor/textures/homedecor_pole_brass_inv.png
+++ b/homedecor_misc/textures/homedecor_pole_brass_inv.png
diff --git a/homedecor/textures/homedecor_pole_wrought_iron_inv.png b/homedecor_misc/textures/homedecor_pole_wrought_iron_inv.png
index 0f8e303..0f8e303 100644
--- a/homedecor/textures/homedecor_pole_wrought_iron_inv.png
+++ b/homedecor_misc/textures/homedecor_pole_wrought_iron_inv.png
diff --git a/homedecor/textures/homedecor_pool_table_baize.png b/homedecor_misc/textures/homedecor_pool_table_baize.png
index 039118c..039118c 100644
--- a/homedecor/textures/homedecor_pool_table_baize.png
+++ b/homedecor_misc/textures/homedecor_pool_table_baize.png
diff --git a/homedecor/textures/homedecor_pool_table_balls.png b/homedecor_misc/textures/homedecor_pool_table_balls.png
index 1cd04b6..1cd04b6 100644
--- a/homedecor/textures/homedecor_pool_table_balls.png
+++ b/homedecor_misc/textures/homedecor_pool_table_balls.png
diff --git a/homedecor/textures/homedecor_pool_table_cue.png b/homedecor_misc/textures/homedecor_pool_table_cue.png
index fe12d47..fe12d47 100644
--- a/homedecor/textures/homedecor_pool_table_cue.png
+++ b/homedecor_misc/textures/homedecor_pool_table_cue.png
diff --git a/homedecor/textures/homedecor_pool_table_inv.png b/homedecor_misc/textures/homedecor_pool_table_inv.png
index 33ce3d5..33ce3d5 100644
--- a/homedecor/textures/homedecor_pool_table_inv.png
+++ b/homedecor_misc/textures/homedecor_pool_table_inv.png
diff --git a/homedecor/textures/homedecor_pool_table_pockets.png b/homedecor_misc/textures/homedecor_pool_table_pockets.png
index 28145d4..28145d4 100644
--- a/homedecor/textures/homedecor_pool_table_pockets.png
+++ b/homedecor_misc/textures/homedecor_pool_table_pockets.png
diff --git a/homedecor/textures/homedecor_rug_large.png b/homedecor_misc/textures/homedecor_rug_large.png
index b2a441d..b2a441d 100644
--- a/homedecor/textures/homedecor_rug_large.png
+++ b/homedecor_misc/textures/homedecor_rug_large.png
diff --git a/homedecor/textures/homedecor_rug_persian.png b/homedecor_misc/textures/homedecor_rug_persian.png
index ccbd741..ccbd741 100644
--- a/homedecor/textures/homedecor_rug_persian.png
+++ b/homedecor_misc/textures/homedecor_rug_persian.png
diff --git a/homedecor/textures/homedecor_rug_small.png b/homedecor_misc/textures/homedecor_rug_small.png
index b2a441d..b2a441d 100644
--- a/homedecor/textures/homedecor_rug_small.png
+++ b/homedecor_misc/textures/homedecor_rug_small.png
diff --git a/homedecor/textures/homedecor_skateboard.png b/homedecor_misc/textures/homedecor_skateboard.png
index 10a5ffd..10a5ffd 100644
--- a/homedecor/textures/homedecor_skateboard.png
+++ b/homedecor_misc/textures/homedecor_skateboard.png
diff --git a/homedecor/textures/homedecor_skateboard_inv.png b/homedecor_misc/textures/homedecor_skateboard_inv.png
index d7fc7b7..d7fc7b7 100644
--- a/homedecor/textures/homedecor_skateboard_inv.png
+++ b/homedecor_misc/textures/homedecor_skateboard_inv.png
diff --git a/homedecor/textures/homedecor_sport_bench_inv.png b/homedecor_misc/textures/homedecor_sport_bench_inv.png
index f6bccfa..f6bccfa 100644
--- a/homedecor/textures/homedecor_sport_bench_inv.png
+++ b/homedecor_misc/textures/homedecor_sport_bench_inv.png
diff --git a/homedecor/textures/homedecor_tatami.png b/homedecor_misc/textures/homedecor_tatami.png
index da40bd1..da40bd1 100644
--- a/homedecor/textures/homedecor_tatami.png
+++ b/homedecor_misc/textures/homedecor_tatami.png
diff --git a/homedecor/textures/homedecor_tool_cabinet_drawers.png b/homedecor_misc/textures/homedecor_tool_cabinet_drawers.png
index 28d857c..28d857c 100644
--- a/homedecor/textures/homedecor_tool_cabinet_drawers.png
+++ b/homedecor_misc/textures/homedecor_tool_cabinet_drawers.png
diff --git a/homedecor/textures/homedecor_tool_cabinet_inv.png b/homedecor_misc/textures/homedecor_tool_cabinet_inv.png
index 56f8b20..56f8b20 100644
--- a/homedecor/textures/homedecor_tool_cabinet_inv.png
+++ b/homedecor_misc/textures/homedecor_tool_cabinet_inv.png
diff --git a/homedecor/textures/homedecor_tool_cabinet_misc.png b/homedecor_misc/textures/homedecor_tool_cabinet_misc.png
index a3237a0..a3237a0 100644
--- a/homedecor/textures/homedecor_tool_cabinet_misc.png
+++ b/homedecor_misc/textures/homedecor_tool_cabinet_misc.png
diff --git a/homedecor/textures/homedecor_trophy_inv.png b/homedecor_misc/textures/homedecor_trophy_inv.png
index 62ece3f..62ece3f 100644
--- a/homedecor/textures/homedecor_trophy_inv.png
+++ b/homedecor_misc/textures/homedecor_trophy_inv.png
diff --git a/homedecor/textures/top_chain_brass_inv.png b/homedecor_misc/textures/top_chain_brass_inv.png
index dc8183c..dc8183c 100644
--- a/homedecor/textures/top_chain_brass_inv.png
+++ b/homedecor_misc/textures/top_chain_brass_inv.png
diff --git a/homedecor/textures/top_chain_wrought_iron_inv.png b/homedecor_misc/textures/top_chain_wrought_iron_inv.png
index cddf6c9..cddf6c9 100644
--- a/homedecor/textures/top_chain_wrought_iron_inv.png
+++ b/homedecor_misc/textures/top_chain_wrought_iron_inv.png
diff --git a/homedecor_office/depends.txt b/homedecor_office/depends.txt
new file mode 100644
index 0000000..f3234ae
--- /dev/null
+++ b/homedecor_office/depends.txt
@@ -0,0 +1,6 @@
+homedecor_common
+default
+basic_materials
+dye
+moreblocks?
+building_blocks?
diff --git a/homedecor/office.lua b/homedecor_office/init.lua
index 6e9bbc1..e6deb15 100644
--- a/homedecor/office.lua
+++ b/homedecor_office/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 homedecor.register("filing_cabinet", {
 	description = S("Filing cabinet"),
@@ -124,3 +124,79 @@ for _, c in pairs(chairs) do
 		on_rotate = screwdriver.rotate_simple
 	})
 end
+
+-- crafting
+
+
+minetest.register_craft({
+    output = "homedecor:desk",
+    recipe = {
+		{ "stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood" },
+		{ "homedecor:drawer_small", "default:wood", "default:wood" },
+		{ "homedecor:drawer_small", "", "default:wood" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:desk",
+    recipe = {
+		{ "moreblocks:slab_wood", "moreblocks:slab_wood", "moreblocks:slab_wood" },
+		{ "homedecor:drawer_small", "default:wood", "default:wood" },
+		{ "homedecor:drawer_small", "", "default:wood" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:filing_cabinet",
+    recipe = {
+		{ "", "default:wood", "" },
+		{ "default:wood", "homedecor:drawer_small", "default:wood" },
+		{ "", "default:wood", "" },
+    },
+})
+
+minetest.register_craft({
+	output = "homedecor:office_chair_basic",
+	recipe = {
+		{ "", "", "wool:black" },
+		{ "", "wool:black", "default:steel_ingot" },
+		{ "group:stick", "homedecor:pole_wrought_iron", "group:stick" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:office_chair_upscale",
+	recipe = {
+		{ "dye:black", "building_blocks:sticks", "group:wool" },
+		{ "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" },
+		{ "building_blocks:sticks", "homedecor:pole_wrought_iron", "building_blocks:sticks" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:calendar",
+	recipe = {
+		{ "","dye:red","" },
+		{ "","dye:black","" },
+		{ "","default:paper","" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:desk_globe",
+	recipe = {
+		{ "group:stick", "basic_materials:plastic_sheet", "dye:green" },
+		{ "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ "group:stick", "stairs:slab_wood", "dye:blue" }
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:desk_globe",
+	recipe = {
+		{ "group:stick", "basic_materials:plastic_sheet", "dye:green" },
+		{ "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ "group:stick", "moreblocks:slab_wood", "dye:blue" }
+	},
+})
+
diff --git a/homedecor/models/homedecor_calendar.obj b/homedecor_office/models/homedecor_calendar.obj
index f97dcb2..f97dcb2 100644
--- a/homedecor/models/homedecor_calendar.obj
+++ b/homedecor_office/models/homedecor_calendar.obj
diff --git a/homedecor/models/homedecor_desk.obj b/homedecor_office/models/homedecor_desk.obj
index 19d74e0..19d74e0 100644
--- a/homedecor/models/homedecor_desk.obj
+++ b/homedecor_office/models/homedecor_desk.obj
diff --git a/homedecor/models/homedecor_desk_globe.obj b/homedecor_office/models/homedecor_desk_globe.obj
index 039fe4c..039fe4c 100644
--- a/homedecor/models/homedecor_desk_globe.obj
+++ b/homedecor_office/models/homedecor_desk_globe.obj
diff --git a/homedecor/models/homedecor_filing_cabinet.obj b/homedecor_office/models/homedecor_filing_cabinet.obj
index f4970df..f4970df 100644
--- a/homedecor/models/homedecor_filing_cabinet.obj
+++ b/homedecor_office/models/homedecor_filing_cabinet.obj
diff --git a/homedecor/models/homedecor_office_chair_basic.obj b/homedecor_office/models/homedecor_office_chair_basic.obj
index 40ef638..40ef638 100644
--- a/homedecor/models/homedecor_office_chair_basic.obj
+++ b/homedecor_office/models/homedecor_office_chair_basic.obj
diff --git a/homedecor/models/homedecor_office_chair_upscale.obj b/homedecor_office/models/homedecor_office_chair_upscale.obj
index 254cb67..254cb67 100644
--- a/homedecor/models/homedecor_office_chair_upscale.obj
+++ b/homedecor_office/models/homedecor_office_chair_upscale.obj
diff --git a/homedecor/textures/homedecor_calendar.png b/homedecor_office/textures/homedecor_calendar.png
index 0407a75..0407a75 100644
--- a/homedecor/textures/homedecor_calendar.png
+++ b/homedecor_office/textures/homedecor_calendar.png
diff --git a/homedecor/textures/homedecor_calendar_inv.png b/homedecor_office/textures/homedecor_calendar_inv.png
index 8d705f6..8d705f6 100644
--- a/homedecor/textures/homedecor_calendar_inv.png
+++ b/homedecor_office/textures/homedecor_calendar_inv.png
diff --git a/homedecor/textures/homedecor_desk_drawers.png b/homedecor_office/textures/homedecor_desk_drawers.png
index f25fff2..f25fff2 100644
--- a/homedecor/textures/homedecor_desk_drawers.png
+++ b/homedecor_office/textures/homedecor_desk_drawers.png
diff --git a/homedecor/textures/homedecor_desk_globe_inv.png b/homedecor_office/textures/homedecor_desk_globe_inv.png
index c5558c9..c5558c9 100644
--- a/homedecor/textures/homedecor_desk_globe_inv.png
+++ b/homedecor_office/textures/homedecor_desk_globe_inv.png
diff --git a/homedecor/textures/homedecor_desk_inv.png b/homedecor_office/textures/homedecor_desk_inv.png
index fb59d07..fb59d07 100644
--- a/homedecor/textures/homedecor_desk_inv.png
+++ b/homedecor_office/textures/homedecor_desk_inv.png
diff --git a/homedecor/textures/homedecor_earth.png b/homedecor_office/textures/homedecor_earth.png
index 511b3e9..511b3e9 100644
--- a/homedecor/textures/homedecor_earth.png
+++ b/homedecor_office/textures/homedecor_earth.png
diff --git a/homedecor/textures/homedecor_filing_cabinet_bottom.png b/homedecor_office/textures/homedecor_filing_cabinet_bottom.png
index a896a30..a896a30 100644
--- a/homedecor/textures/homedecor_filing_cabinet_bottom.png
+++ b/homedecor_office/textures/homedecor_filing_cabinet_bottom.png
diff --git a/homedecor/textures/homedecor_filing_cabinet_front.png b/homedecor_office/textures/homedecor_filing_cabinet_front.png
index b434932..b434932 100644
--- a/homedecor/textures/homedecor_filing_cabinet_front.png
+++ b/homedecor_office/textures/homedecor_filing_cabinet_front.png
diff --git a/homedecor/textures/homedecor_office_chair_basic.png b/homedecor_office/textures/homedecor_office_chair_basic.png
index a12d1d9..a12d1d9 100644
--- a/homedecor/textures/homedecor_office_chair_basic.png
+++ b/homedecor_office/textures/homedecor_office_chair_basic.png
diff --git a/homedecor/textures/homedecor_office_chair_upscale.png b/homedecor_office/textures/homedecor_office_chair_upscale.png
index cf21dd5..cf21dd5 100644
--- a/homedecor/textures/homedecor_office_chair_upscale.png
+++ b/homedecor_office/textures/homedecor_office_chair_upscale.png
diff --git a/homedecor_pictures_and_paintings/depends.txt b/homedecor_pictures_and_paintings/depends.txt
new file mode 100644
index 0000000..d0de51e
--- /dev/null
+++ b/homedecor_pictures_and_paintings/depends.txt
@@ -0,0 +1,3 @@
+homedecor_common
+default
+dye
diff --git a/homedecor_pictures_and_paintings/init.lua b/homedecor_pictures_and_paintings/init.lua
new file mode 100644
index 0000000..6608107
--- /dev/null
+++ b/homedecor_pictures_and_paintings/init.lua
@@ -0,0 +1,162 @@
+local S = homedecor.gettext
+
+local pframe_cbox = {
+	type = "fixed",
+	fixed = { -0.18, -0.5, -0.08, 0.18, -0.08, 0.18 }
+}
+local n = { 1, 2 }
+
+for _, i in ipairs(n) do
+	homedecor.register("picture_frame"..i, {
+		description = S("Picture Frame "..i),
+		mesh = "homedecor_picture_frame.obj",
+		tiles = {
+			"homedecor_picture_frame_image"..i..".png",
+			homedecor.lux_wood,
+			"homedecor_picture_frame_back.png",
+		},
+		inventory_image = "homedecor_picture_frame"..i.."_inv.png",
+		wield_image = "homedecor_picture_frame"..i.."_inv.png",
+		groups = {snappy = 3},
+		selection_box = pframe_cbox,
+		walkable = false,
+		sounds = default.node_sound_glass_defaults()
+	})
+end
+
+local p_cbox = {
+	type = "fixed",
+	fixed = {
+		{ -0.5, -0.5, 0.4375, 0.5, 0.5, 0.5 }
+	}
+}
+
+for i = 1,20 do
+	homedecor.register("painting_"..i, {
+		description = S("Decorative painting #@1", i),
+		mesh = "homedecor_painting.obj",
+		tiles = {
+			"default_wood.png",
+			"homedecor_blank_canvas.png",
+			"homedecor_painting"..i..".png"
+		},
+		selection_box = p_cbox,
+		walkable = false,
+		groups = {snappy=3},
+		sounds = default.node_sound_wood_defaults(),
+	})
+end
+
+-- crafting
+
+minetest.register_craftitem(":homedecor:blank_canvas", {
+	description = S("Blank Canvas"),
+	inventory_image = "homedecor_blank_canvas.png"
+})
+
+-- paintings
+
+minetest.register_craft({
+    output = "homedecor:blank_canvas",
+    recipe = {
+		{ "", "group:stick", "" },
+		{ "group:stick", "wool:white", "group:stick" },
+		{ "", "group:stick", "" },
+    }
+})
+
+local painting_patterns = {
+	[1] = {	{ "brown", "red", "brown" },
+			{ "dark_green", "red", "green" } },
+
+	[2] = {	{ "green", "yellow", "green" },
+			{ "green", "yellow", "green" } },
+
+	[3] = {	{ "green", "pink", "green" },
+			{ "brown", "pink", "brown" } },
+
+	[4] = {	{ "black", "orange", "grey" },
+			{ "dark_green", "orange", "orange" } },
+
+	[5] = {	{ "blue", "orange", "yellow" },
+			{ "green", "red", "brown" } },
+
+	[6] = {	{ "green", "red", "orange" },
+			{ "orange", "yellow", "green" } },
+
+	[7] = {	{ "blue", "dark_green", "dark_green" },
+			{ "green", "grey", "green" } },
+
+	[8] = {	{ "blue", "blue", "blue" },
+			{ "green", "green", "green" } },
+
+	[9] = {	{ "blue", "blue", "dark_green" },
+			{ "green", "grey", "dark_green" } },
+
+	[10] = { { "green", "white", "green" },
+			 { "dark_green", "white", "dark_green" } },
+
+	[11] = { { "blue", "white", "blue" },
+			 { "blue", "grey", "dark_green" } },
+
+	[12] = { { "green", "green", "green" },
+			 { "grey", "grey", "green" } },
+
+	[13] = { { "blue", "blue", "grey" },
+			 { "dark_green", "white", "white" } },
+
+	[14] = { { "red", "yellow", "blue" },
+			 { "blue", "green", "violet" } },
+
+	[15] = { { "blue", "yellow", "blue" },
+			 { "black", "black", "black" } },
+
+	[16] = { { "red", "orange", "blue" },
+			 { "black", "dark_grey", "grey" } },
+
+	[17] = { { "orange", "yellow", "orange" },
+			 { "black", "black", "black" } },
+
+	[18] = { { "grey", "dark_green", "grey" },
+			 { "white", "white", "white" } },
+
+	[19] = { { "white", "brown", "green" },
+			 { "green", "brown", "brown" } },
+
+	[20] = { { "blue", "blue", "blue" },
+			 { "red", "brown", "grey" } }
+}
+
+for i,recipe in pairs(painting_patterns) do
+
+	local item1 = "dye:"..recipe[1][1]
+	local item2 = "dye:"..recipe[1][2]
+	local item3 = "dye:"..recipe[1][3]
+	local item4 = "dye:"..recipe[2][1]
+	local item5 = "dye:"..recipe[2][2]
+	local item6 = "dye:"..recipe[2][3]
+
+	minetest.register_craft({
+		output = "homedecor:painting_"..i,
+		recipe = {
+			{ item1, item2, item3 },
+			{ item4, item5, item6 },
+			{"", "homedecor:blank_canvas", "" }
+		}
+	})
+end
+
+local picture_dyes = {
+	{"dye:brown", "dye:green"}, -- the figure sitting by the tree, wielding a pick
+	{"dye:green", "dye:blue"}	-- the "family photo"
+}
+
+for i in ipairs(picture_dyes) do
+	minetest.register_craft({
+		output = "homedecor:picture_frame"..i,
+		recipe = {
+			{ picture_dyes[i][1], picture_dyes[i][2] },
+			{ "homedecor:blank_canvas", "group:stick" },
+		},
+	})
+end
diff --git a/homedecor/models/homedecor_painting.obj b/homedecor_pictures_and_paintings/models/homedecor_painting.obj
index bcf4c1e..bcf4c1e 100644
--- a/homedecor/models/homedecor_painting.obj
+++ b/homedecor_pictures_and_paintings/models/homedecor_painting.obj
diff --git a/homedecor/models/homedecor_picture_frame.obj b/homedecor_pictures_and_paintings/models/homedecor_picture_frame.obj
index 46e9f15..46e9f15 100644
--- a/homedecor/models/homedecor_picture_frame.obj
+++ b/homedecor_pictures_and_paintings/models/homedecor_picture_frame.obj
diff --git a/homedecor/textures/homedecor_blank_canvas.png b/homedecor_pictures_and_paintings/textures/homedecor_blank_canvas.png
index 88c0f42..88c0f42 100644
--- a/homedecor/textures/homedecor_blank_canvas.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_blank_canvas.png
diff --git a/homedecor/textures/homedecor_painting1.png b/homedecor_pictures_and_paintings/textures/homedecor_painting1.png
index be637df..be637df 100644
--- a/homedecor/textures/homedecor_painting1.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting1.png
diff --git a/homedecor/textures/homedecor_painting10.png b/homedecor_pictures_and_paintings/textures/homedecor_painting10.png
index 4e1d5fe..4e1d5fe 100644
--- a/homedecor/textures/homedecor_painting10.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting10.png
diff --git a/homedecor/textures/homedecor_painting11.png b/homedecor_pictures_and_paintings/textures/homedecor_painting11.png
index 5c9133d..5c9133d 100644
--- a/homedecor/textures/homedecor_painting11.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting11.png
diff --git a/homedecor/textures/homedecor_painting12.png b/homedecor_pictures_and_paintings/textures/homedecor_painting12.png
index 04d9e0c..04d9e0c 100644
--- a/homedecor/textures/homedecor_painting12.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting12.png
diff --git a/homedecor/textures/homedecor_painting13.png b/homedecor_pictures_and_paintings/textures/homedecor_painting13.png
index 9a9f28c..9a9f28c 100644
--- a/homedecor/textures/homedecor_painting13.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting13.png
diff --git a/homedecor/textures/homedecor_painting14.png b/homedecor_pictures_and_paintings/textures/homedecor_painting14.png
index b7e7080..b7e7080 100644
--- a/homedecor/textures/homedecor_painting14.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting14.png
diff --git a/homedecor/textures/homedecor_painting15.png b/homedecor_pictures_and_paintings/textures/homedecor_painting15.png
index 3e6010f..3e6010f 100644
--- a/homedecor/textures/homedecor_painting15.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting15.png
diff --git a/homedecor/textures/homedecor_painting16.png b/homedecor_pictures_and_paintings/textures/homedecor_painting16.png
index 2e487ef..2e487ef 100644
--- a/homedecor/textures/homedecor_painting16.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting16.png
diff --git a/homedecor/textures/homedecor_painting17.png b/homedecor_pictures_and_paintings/textures/homedecor_painting17.png
index c4ba281..c4ba281 100644
--- a/homedecor/textures/homedecor_painting17.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting17.png
diff --git a/homedecor/textures/homedecor_painting18.png b/homedecor_pictures_and_paintings/textures/homedecor_painting18.png
index 04b7403..04b7403 100644
--- a/homedecor/textures/homedecor_painting18.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting18.png
diff --git a/homedecor/textures/homedecor_painting19.png b/homedecor_pictures_and_paintings/textures/homedecor_painting19.png
index 65a3fb3..65a3fb3 100644
--- a/homedecor/textures/homedecor_painting19.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting19.png
diff --git a/homedecor/textures/homedecor_painting2.png b/homedecor_pictures_and_paintings/textures/homedecor_painting2.png
index abb3fa0..abb3fa0 100644
--- a/homedecor/textures/homedecor_painting2.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting2.png
diff --git a/homedecor/textures/homedecor_painting20.png b/homedecor_pictures_and_paintings/textures/homedecor_painting20.png
index f5e6628..f5e6628 100644
--- a/homedecor/textures/homedecor_painting20.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting20.png
diff --git a/homedecor/textures/homedecor_painting3.png b/homedecor_pictures_and_paintings/textures/homedecor_painting3.png
index 55d8b5c..55d8b5c 100644
--- a/homedecor/textures/homedecor_painting3.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting3.png
diff --git a/homedecor/textures/homedecor_painting4.png b/homedecor_pictures_and_paintings/textures/homedecor_painting4.png
index be4268c..be4268c 100644
--- a/homedecor/textures/homedecor_painting4.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting4.png
diff --git a/homedecor/textures/homedecor_painting5.png b/homedecor_pictures_and_paintings/textures/homedecor_painting5.png
index c5600de..c5600de 100644
--- a/homedecor/textures/homedecor_painting5.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting5.png
diff --git a/homedecor/textures/homedecor_painting6.png b/homedecor_pictures_and_paintings/textures/homedecor_painting6.png
index d296cb6..d296cb6 100644
--- a/homedecor/textures/homedecor_painting6.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting6.png
diff --git a/homedecor/textures/homedecor_painting7.png b/homedecor_pictures_and_paintings/textures/homedecor_painting7.png
index 6f251b8..6f251b8 100644
--- a/homedecor/textures/homedecor_painting7.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting7.png
diff --git a/homedecor/textures/homedecor_painting8.png b/homedecor_pictures_and_paintings/textures/homedecor_painting8.png
index 5944044..5944044 100644
--- a/homedecor/textures/homedecor_painting8.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting8.png
diff --git a/homedecor/textures/homedecor_painting9.png b/homedecor_pictures_and_paintings/textures/homedecor_painting9.png
index c8147c9..c8147c9 100644
--- a/homedecor/textures/homedecor_painting9.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting9.png
diff --git a/homedecor/textures/homedecor_painting_back.png b/homedecor_pictures_and_paintings/textures/homedecor_painting_back.png
index 68dbbf5..68dbbf5 100644
--- a/homedecor/textures/homedecor_painting_back.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_painting_back.png
diff --git a/homedecor/textures/homedecor_picture_frame1_inv.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame1_inv.png
index cf74685..cf74685 100644
--- a/homedecor/textures/homedecor_picture_frame1_inv.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame1_inv.png
diff --git a/homedecor/textures/homedecor_picture_frame2_inv.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame2_inv.png
index e35af61..e35af61 100644
--- a/homedecor/textures/homedecor_picture_frame2_inv.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame2_inv.png
diff --git a/homedecor/textures/homedecor_picture_frame_back.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_back.png
index 9e4489c..9e4489c 100644
--- a/homedecor/textures/homedecor_picture_frame_back.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_back.png
diff --git a/homedecor/textures/homedecor_picture_frame_image1.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_image1.png
index 6c92937..6c92937 100644
--- a/homedecor/textures/homedecor_picture_frame_image1.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_image1.png
diff --git a/homedecor/textures/homedecor_picture_frame_image2.png b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_image2.png
index 689a354..689a354 100644
--- a/homedecor/textures/homedecor_picture_frame_image2.png
+++ b/homedecor_pictures_and_paintings/textures/homedecor_picture_frame_image2.png
diff --git a/homedecor_roofing/depends.txt b/homedecor_roofing/depends.txt
new file mode 100644
index 0000000..d0de51e
--- /dev/null
+++ b/homedecor_roofing/depends.txt
@@ -0,0 +1,3 @@
+homedecor_common
+default
+dye
diff --git a/homedecor/roofing.lua b/homedecor_roofing/init.lua
index 1299fcb..31f2a1e 100644
--- a/homedecor/roofing.lua
+++ b/homedecor_roofing/init.lua
@@ -1,9 +1,9 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local function N_(x) return x end
 
-minetest.register_node("homedecor:skylight", {
+minetest.register_node(":homedecor:skylight", {
 	description = S("Glass Skylight"),
 	drawtype = "raillike",
 	tiles = { "default_glass.png" },
@@ -15,7 +15,7 @@ minetest.register_node("homedecor:skylight", {
 	selection_box = homedecor.nodebox.slab_y(0.1),
 })
 
-minetest.register_node("homedecor:skylight_frosted", {
+minetest.register_node(":homedecor:skylight_frosted", {
 	description = S("Glass Skylight Frosted"),
 	drawtype = "raillike",
 	tiles = { "homedecor_skylight_frosted.png" },
@@ -29,7 +29,7 @@ minetest.register_node("homedecor:skylight_frosted", {
 })
 
 for _, s in pairs({ N_("asphalt"), N_("terracotta"), N_("wood") }) do
-	minetest.register_node("homedecor:shingles_"..s, {
+	minetest.register_node(":homedecor:shingles_"..s, {
 		description = S("Shingles (@1)", S(s)),
 		drawtype = "raillike",
 		tiles = { "homedecor_shingles_"..s..".png" },
@@ -83,7 +83,7 @@ homedecor.register_outer_corner = function(modname, subname, groups, slope_image
 		tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }
 	end
 
-	minetest.register_node(modname..":shingle_outer_corner_" .. subname, {
+	minetest.register_node(":"..modname..":shingle_outer_corner_" .. subname, {
 		description = S("@1 (outer corner)", description),
 		drawtype = "mesh",
 		mesh = "homedecor_slope_outer_corner.obj",
@@ -105,7 +105,7 @@ homedecor.register_inner_corner = function(modname, subname, groups, slope_image
 		tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }
 	end
 
-	minetest.register_node(modname..":shingle_inner_corner_" .. subname, {
+	minetest.register_node(":"..modname..":shingle_inner_corner_" .. subname, {
 		description = S("@1 (inner corner)", description),
 		drawtype = "mesh",
 		mesh = "homedecor_slope_inner_corner.obj",
@@ -126,7 +126,7 @@ homedecor.register_slope = function(modname, subname, recipeitem, groups, slope_
 		tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }
 	end
 
-	minetest.register_node(modname..":shingle_side_" .. subname, {
+	minetest.register_node(":"..modname..":shingle_side_" .. subname, {
 		description = description,
 		drawtype = "mesh",
 		mesh = "homedecor_slope.obj",
@@ -319,3 +319,43 @@ homedecor.register("chimney", {
 	groups = {cracky=3},
 	sounds = default.node_sound_stone_defaults()
 })
+
+-- crafting
+
+minetest.register_craft( {
+        output = "homedecor:skylight 4",
+        recipe = {
+		{ "homedecor:glass_table_large", "homedecor:glass_table_large" },
+		{ "homedecor:glass_table_large", "homedecor:glass_table_large" },
+        },
+})
+
+minetest.register_craft( {
+	type = "shapeless",
+        output = "homedecor:skylight_frosted",
+        recipe = {
+			"dye:white",
+			"homedecor:skylight"
+		},
+})
+
+minetest.register_craft({
+        type = "cooking",
+        output = "homedecor:skylight",
+        recipe = "homedecor:skylight_frosted",
+})
+
+-- recycling
+
+minetest.register_craft({
+        type = "shapeless",
+        output = "vessels:glass_fragments 2",
+        recipe = {
+		"homedecor:skylight",
+		"homedecor:skylight",
+		"homedecor:skylight",
+		"homedecor:skylight",
+		"homedecor:skylight",
+		"homedecor:skylight"
+	}
+})
diff --git a/homedecor/textures/homedecor_shingles_asphalt_inv.png b/homedecor_roofing/textures/homedecor_shingles_asphalt_inv.png
index d36ca09..d36ca09 100644
--- a/homedecor/textures/homedecor_shingles_asphalt_inv.png
+++ b/homedecor_roofing/textures/homedecor_shingles_asphalt_inv.png
diff --git a/homedecor/textures/homedecor_shingles_glass.png b/homedecor_roofing/textures/homedecor_shingles_glass.png
index c567eb3..c567eb3 100644
--- a/homedecor/textures/homedecor_shingles_glass.png
+++ b/homedecor_roofing/textures/homedecor_shingles_glass.png
diff --git a/homedecor/textures/homedecor_shingles_wood_inv.png b/homedecor_roofing/textures/homedecor_shingles_wood_inv.png
index 018dad0..018dad0 100644
--- a/homedecor/textures/homedecor_shingles_wood_inv.png
+++ b/homedecor_roofing/textures/homedecor_shingles_wood_inv.png
diff --git a/homedecor/textures/homedecor_skylight_frosted.png b/homedecor_roofing/textures/homedecor_skylight_frosted.png
index 810b63c..810b63c 100644
--- a/homedecor/textures/homedecor_skylight_frosted.png
+++ b/homedecor_roofing/textures/homedecor_skylight_frosted.png
diff --git a/homedecor/textures/homedecor_skylight_frosted_inv.png b/homedecor_roofing/textures/homedecor_skylight_frosted_inv.png
index e00585b..e00585b 100644
--- a/homedecor/textures/homedecor_skylight_frosted_inv.png
+++ b/homedecor_roofing/textures/homedecor_skylight_frosted_inv.png
diff --git a/homedecor/textures/homedecor_skylight_inv.png b/homedecor_roofing/textures/homedecor_skylight_inv.png
index c437052..c437052 100644
--- a/homedecor/textures/homedecor_skylight_inv.png
+++ b/homedecor_roofing/textures/homedecor_skylight_inv.png
diff --git a/homedecor_tables/depends.txt b/homedecor_tables/depends.txt
new file mode 100644
index 0000000..fb5d601
--- /dev/null
+++ b/homedecor_tables/depends.txt
@@ -0,0 +1,3 @@
+homedecor_common
+default
+basic_materials
diff --git a/homedecor/tables.lua b/homedecor_tables/init.lua
index 70ced41..d32b51d 100644
--- a/homedecor/tables.lua
+++ b/homedecor_tables/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 -- Various kinds of tables
 
@@ -200,3 +200,172 @@ homedecor.register("utility_table_legs", {
 		fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 }
 	},
 })
+
+-- crafting
+
+
+minetest.register_craft( {
+        output = "homedecor:glass_table_small_round_b 15",
+        recipe = {
+                { "", "default:glass", "" },
+                { "default:glass", "default:glass", "default:glass" },
+                { "", "default:glass", "" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:glass_table_small_square_b 2",
+        recipe = {
+		{"homedecor:glass_table_small_round", "homedecor:glass_table_small_round" },
+	}
+})
+
+minetest.register_craft( {
+        output = "homedecor:glass_table_large_b 2",
+        recipe = {
+		{ "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" },
+	}
+})
+
+--
+
+minetest.register_craft( {
+        output = "homedecor:wood_table_small_round_b 15",
+        recipe = {
+                { "", "group:wood", "" },
+                { "group:wood", "group:wood", "group:wood" },
+                { "", "group:wood", "" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:wood_table_small_square_b 2",
+        recipe = {
+		{ "homedecor:wood_table_small_round","homedecor:wood_table_small_round" },
+	}
+})
+
+minetest.register_craft( {
+        output = "homedecor:wood_table_large_b 2",
+        recipe = {
+		{ "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" },
+	}
+})
+
+--
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:wood_table_small_round_b",
+        burntime = 30,
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:wood_table_small_square_b",
+        burntime = 30,
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:wood_table_large_b",
+        burntime = 30,
+})
+
+
+minetest.register_craft( {
+        output = "homedecor:table_legs_wrought_iron 3",
+        recipe = {
+                { "", "default:iron_lump", "" },
+                { "", "default:iron_lump", "" },
+                { "default:iron_lump", "default:iron_lump", "default:iron_lump" },
+        },
+})
+
+minetest.register_craft( {
+        output = "homedecor:table_legs_brass 3",
+	recipe = {
+		{ "", "basic_materials:brass_ingot", "" },
+		{ "", "basic_materials:brass_ingot", "" },
+		{ "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }
+	},
+})
+
+minetest.register_craft( {
+        output = "homedecor:utility_table_legs",
+        recipe = {
+                { "group:stick", "group:stick", "group:stick" },
+                { "group:stick", "", "group:stick" },
+                { "group:stick", "", "group:stick" },
+        },
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:utility_table_legs",
+        burntime = 30,
+})
+
+
+
+-- recycling
+
+minetest.register_craft({
+        type = "shapeless",
+        output = "vessels:glass_fragments",
+        recipe = {
+		"homedecor:glass_table_small_round",
+		"homedecor:glass_table_small_round",
+		"homedecor:glass_table_small_round"
+	}
+})
+
+minetest.register_craft({
+        type = "shapeless",
+        output = "vessels:glass_fragments",
+        recipe = {
+		"homedecor:glass_table_small_square",
+		"homedecor:glass_table_small_square",
+		"homedecor:glass_table_small_square"
+	}
+})
+
+minetest.register_craft({
+        type = "shapeless",
+        output = "vessels:glass_fragments",
+        recipe = {
+		"homedecor:glass_table_large",
+		"homedecor:glass_table_large",
+		"homedecor:glass_table_large"
+	}
+})
+
+minetest.register_craft({
+        type = "shapeless",
+        output = "default:stick 4",
+        recipe = {
+		"homedecor:wood_table_small_round",
+		"homedecor:wood_table_small_round",
+		"homedecor:wood_table_small_round"
+	}
+})
+
+minetest.register_craft({
+        type = "shapeless",
+        output = "default:stick 4",
+        recipe = {
+		"homedecor:wood_table_small_square",
+		"homedecor:wood_table_small_square",
+		"homedecor:wood_table_small_square"
+	}
+})
+
+minetest.register_craft({
+        type = "shapeless",
+        output = "default:stick 4",
+        recipe = {
+		"homedecor:wood_table_large",
+		"homedecor:wood_table_large",
+		"homedecor:wood_table_large"
+	}
+})
diff --git a/homedecor/models/homedecor_table_small_round.obj b/homedecor_tables/models/homedecor_table_small_round.obj
index c0bb6e2..c0bb6e2 100644
--- a/homedecor/models/homedecor_table_small_round.obj
+++ b/homedecor_tables/models/homedecor_table_small_round.obj
diff --git a/homedecor/models/homedecor_table_small_square.obj b/homedecor_tables/models/homedecor_table_small_square.obj
index 467259e..467259e 100644
--- a/homedecor/models/homedecor_table_small_square.obj
+++ b/homedecor_tables/models/homedecor_table_small_square.obj
diff --git a/homedecor/textures/homedecor_glass_face_clean.png b/homedecor_tables/textures/homedecor_glass_face_clean.png
index 18271fe..18271fe 100644
--- a/homedecor/textures/homedecor_glass_face_clean.png
+++ b/homedecor_tables/textures/homedecor_glass_face_clean.png
diff --git a/homedecor/textures/homedecor_glass_table_large_edges.png b/homedecor_tables/textures/homedecor_glass_table_large_edges.png
index 3225bf7..3225bf7 100644
--- a/homedecor/textures/homedecor_glass_table_large_edges.png
+++ b/homedecor_tables/textures/homedecor_glass_table_large_edges.png
diff --git a/homedecor/textures/homedecor_glass_table_large_inv.png b/homedecor_tables/textures/homedecor_glass_table_large_inv.png
index f6580c4..f6580c4 100644
--- a/homedecor/textures/homedecor_glass_table_large_inv.png
+++ b/homedecor_tables/textures/homedecor_glass_table_large_inv.png
diff --git a/homedecor/textures/homedecor_glass_table_large_tb.png b/homedecor_tables/textures/homedecor_glass_table_large_tb.png
index 5862450..5862450 100644
--- a/homedecor/textures/homedecor_glass_table_large_tb.png
+++ b/homedecor_tables/textures/homedecor_glass_table_large_tb.png
diff --git a/homedecor/textures/homedecor_glass_table_small_round.png b/homedecor_tables/textures/homedecor_glass_table_small_round.png
index 99cb543..99cb543 100644
--- a/homedecor/textures/homedecor_glass_table_small_round.png
+++ b/homedecor_tables/textures/homedecor_glass_table_small_round.png
diff --git a/homedecor/textures/homedecor_glass_table_small_round_inv.png b/homedecor_tables/textures/homedecor_glass_table_small_round_inv.png
index 1ff5d25..1ff5d25 100644
--- a/homedecor/textures/homedecor_glass_table_small_round_inv.png
+++ b/homedecor_tables/textures/homedecor_glass_table_small_round_inv.png
diff --git a/homedecor/textures/homedecor_glass_table_small_square.png b/homedecor_tables/textures/homedecor_glass_table_small_square.png
index 0f6078b..0f6078b 100644
--- a/homedecor/textures/homedecor_glass_table_small_square.png
+++ b/homedecor_tables/textures/homedecor_glass_table_small_square.png
diff --git a/homedecor/textures/homedecor_glass_table_small_square_inv.png b/homedecor_tables/textures/homedecor_glass_table_small_square_inv.png
index 2898c21..2898c21 100644
--- a/homedecor/textures/homedecor_glass_table_small_square_inv.png
+++ b/homedecor_tables/textures/homedecor_glass_table_small_square_inv.png
diff --git a/homedecor/textures/homedecor_table_legs_brass.png b/homedecor_tables/textures/homedecor_table_legs_brass.png
index 219c517..219c517 100644
--- a/homedecor/textures/homedecor_table_legs_brass.png
+++ b/homedecor_tables/textures/homedecor_table_legs_brass.png
diff --git a/homedecor/textures/homedecor_table_legs_wrought_iron.png b/homedecor_tables/textures/homedecor_table_legs_wrought_iron.png
index 54d02ee..54d02ee 100644
--- a/homedecor/textures/homedecor_table_legs_wrought_iron.png
+++ b/homedecor_tables/textures/homedecor_table_legs_wrought_iron.png
diff --git a/homedecor/textures/homedecor_utility_table_edges.png b/homedecor_tables/textures/homedecor_utility_table_edges.png
index b4b8a1d..b4b8a1d 100644
--- a/homedecor/textures/homedecor_utility_table_edges.png
+++ b/homedecor_tables/textures/homedecor_utility_table_edges.png
diff --git a/homedecor/textures/homedecor_utility_table_legs.png b/homedecor_tables/textures/homedecor_utility_table_legs.png
index 3fad577..3fad577 100644
--- a/homedecor/textures/homedecor_utility_table_legs.png
+++ b/homedecor_tables/textures/homedecor_utility_table_legs.png
diff --git a/homedecor/textures/homedecor_utility_table_legs_inv.png b/homedecor_tables/textures/homedecor_utility_table_legs_inv.png
index 7df2965..7df2965 100644
--- a/homedecor/textures/homedecor_utility_table_legs_inv.png
+++ b/homedecor_tables/textures/homedecor_utility_table_legs_inv.png
diff --git a/homedecor/textures/homedecor_utility_table_tb.png b/homedecor_tables/textures/homedecor_utility_table_tb.png
index 7a134e7..7a134e7 100644
--- a/homedecor/textures/homedecor_utility_table_tb.png
+++ b/homedecor_tables/textures/homedecor_utility_table_tb.png
diff --git a/homedecor/textures/homedecor_wood_table_large_edges.png b/homedecor_tables/textures/homedecor_wood_table_large_edges.png
index b4b8a1d..b4b8a1d 100644
--- a/homedecor/textures/homedecor_wood_table_large_edges.png
+++ b/homedecor_tables/textures/homedecor_wood_table_large_edges.png
diff --git a/homedecor/textures/homedecor_wood_table_large_inv.png b/homedecor_tables/textures/homedecor_wood_table_large_inv.png
index 92fc76b..92fc76b 100644
--- a/homedecor/textures/homedecor_wood_table_large_inv.png
+++ b/homedecor_tables/textures/homedecor_wood_table_large_inv.png
diff --git a/homedecor/textures/homedecor_wood_table_large_tb.png b/homedecor_tables/textures/homedecor_wood_table_large_tb.png
index e3615c8..e3615c8 100644
--- a/homedecor/textures/homedecor_wood_table_large_tb.png
+++ b/homedecor_tables/textures/homedecor_wood_table_large_tb.png
diff --git a/homedecor/textures/homedecor_wood_table_small_round.png b/homedecor_tables/textures/homedecor_wood_table_small_round.png
index 74810c0..74810c0 100644
--- a/homedecor/textures/homedecor_wood_table_small_round.png
+++ b/homedecor_tables/textures/homedecor_wood_table_small_round.png
diff --git a/homedecor/textures/homedecor_wood_table_small_round_inv.png b/homedecor_tables/textures/homedecor_wood_table_small_round_inv.png
index d5e5609..d5e5609 100644
--- a/homedecor/textures/homedecor_wood_table_small_round_inv.png
+++ b/homedecor_tables/textures/homedecor_wood_table_small_round_inv.png
diff --git a/homedecor/textures/homedecor_wood_table_small_square.png b/homedecor_tables/textures/homedecor_wood_table_small_square.png
index bdd4129..bdd4129 100644
--- a/homedecor/textures/homedecor_wood_table_small_square.png
+++ b/homedecor_tables/textures/homedecor_wood_table_small_square.png
diff --git a/homedecor/textures/homedecor_wood_table_small_square_inv.png b/homedecor_tables/textures/homedecor_wood_table_small_square_inv.png
index 4e5e2b3..4e5e2b3 100644
--- a/homedecor/textures/homedecor_wood_table_small_square_inv.png
+++ b/homedecor_tables/textures/homedecor_wood_table_small_square_inv.png
diff --git a/homedecor_trash_cans/depends.txt b/homedecor_trash_cans/depends.txt
new file mode 100644
index 0000000..ac31e7d
--- /dev/null
+++ b/homedecor_trash_cans/depends.txt
@@ -0,0 +1,4 @@
+homedecor_common
+default
+basic_materials
+dye
diff --git a/homedecor/trash_cans.lua b/homedecor_trash_cans/init.lua
index 7da6c04..dbd4e11 100644
--- a/homedecor/trash_cans.lua
+++ b/homedecor_trash_cans/init.lua
@@ -1,15 +1,17 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local tg_cbox = {
 	type = "fixed",
 	fixed = { -0.35, -0.5, -0.35, 0.35, 0.4, 0.35 }
 }
 
+local trashcan_green = 0x00006000
+
 homedecor.register("trash_can_green", {
 	drawtype = "mesh",
 	mesh = "homedecor_trash_can_green.obj",
-	tiles = { "homedecor_pool_table_baize.png" },
+	tiles = { { name = "homedecor_generic_plastic.png", color = trashcan_green } },
 	inventory_image = "homedecor_trash_can_green_inv.png",
 	description = S("Green Trash Can"),
 	groups = {snappy=3},
@@ -23,7 +25,7 @@ homedecor.register("trash_can_green", {
 homedecor.register("trash_can_green_open", {
 	drawtype = "mesh",
 	mesh = "homedecor_trash_can_green_open.obj",
-	tiles = { "homedecor_pool_table_baize.png" },
+	tiles = { { name = "homedecor_generic_plastic.png", color = trashcan_green } },
 	groups = {snappy=3, not_in_creative_inventory=1},
 	selection_box = tg_cbox,
 	collision_box = tg_cbox,
@@ -64,3 +66,23 @@ homedecor.register("trash_can", {
 	selection_box = trash_cbox,
 	collision_box = trash_cbox,
 })
+
+-- crafting
+
+
+minetest.register_craft( {
+        output = "homedecor:trash_can 3",
+        recipe = {
+			{ "basic_materials:steel_wire", "", "basic_materials:steel_wire" },
+			{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
+        },
+})
+
+minetest.register_craft({
+	output = "homedecor:trash_can_green",
+	recipe = {
+		{ "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "dye:green", "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+	},
+})
diff --git a/homedecor/models/homedecor_trash_can.obj b/homedecor_trash_cans/models/homedecor_trash_can.obj
index 9b461f9..9b461f9 100644
--- a/homedecor/models/homedecor_trash_can.obj
+++ b/homedecor_trash_cans/models/homedecor_trash_can.obj
diff --git a/homedecor/models/homedecor_trash_can_green.obj b/homedecor_trash_cans/models/homedecor_trash_can_green.obj
index 5d69ab7..5d69ab7 100644
--- a/homedecor/models/homedecor_trash_can_green.obj
+++ b/homedecor_trash_cans/models/homedecor_trash_can_green.obj
diff --git a/homedecor/models/homedecor_trash_can_green_open.obj b/homedecor_trash_cans/models/homedecor_trash_can_green_open.obj
index 4e436ed..4e436ed 100644
--- a/homedecor/models/homedecor_trash_can_green_open.obj
+++ b/homedecor_trash_cans/models/homedecor_trash_can_green_open.obj
diff --git a/homedecor/textures/homedecor_trash_can.png b/homedecor_trash_cans/textures/homedecor_trash_can.png
index da5a3b0..da5a3b0 100644
--- a/homedecor/textures/homedecor_trash_can.png
+++ b/homedecor_trash_cans/textures/homedecor_trash_can.png
diff --git a/homedecor/textures/homedecor_trash_can_green_inv.png b/homedecor_trash_cans/textures/homedecor_trash_can_green_inv.png
index 23104dd..23104dd 100644
--- a/homedecor/textures/homedecor_trash_can_green_inv.png
+++ b/homedecor_trash_cans/textures/homedecor_trash_can_green_inv.png
diff --git a/homedecor/textures/homedecor_trash_can_inv.png b/homedecor_trash_cans/textures/homedecor_trash_can_inv.png
index f257d70..f257d70 100644
--- a/homedecor/textures/homedecor_trash_can_inv.png
+++ b/homedecor_trash_cans/textures/homedecor_trash_can_inv.png
diff --git a/homedecor_wardrobe/depends.txt b/homedecor_wardrobe/depends.txt
new file mode 100644
index 0000000..084de05
--- /dev/null
+++ b/homedecor_wardrobe/depends.txt
@@ -0,0 +1,4 @@
+homedecor_common
+default
+homedecor_misc?
+skinsdb?
diff --git a/homedecor/wardrobe.lua b/homedecor_wardrobe/init.lua
index 6ce13f8..4927ed3 100644
--- a/homedecor/wardrobe.lua
+++ b/homedecor_wardrobe/init.lua
@@ -1,10 +1,9 @@
+modpath = minetest.get_modpath("homedecor")
 
-local S = homedecor_i18n.gettext
+screwdriver = screwdriver or {}
 
-local wd_cbox = {
-	type = "fixed",
-	fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 }
-}
+local placeholder_node = "air"
+local wd_cbox = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5}}
 
 -- cache set_textures function (fallback to old version)
 -- default.player_set_textures is deprecated and will be removed in future
@@ -16,38 +15,54 @@ local armor_mod_path = minetest.get_modpath("3d_armor")
 
 local skinslist = {"male1", "male2", "male3", "male4", "male5"}
 local default_skin = "character.png"
-
 local skinsdb_mod_path = minetest.get_modpath("skinsdb")
+
 if skinsdb_mod_path then
+
 	for _, shrt in ipairs(skinslist) do
+
 		for _, prefix in ipairs({"", "fe"}) do
+
 			local skin_name = prefix..shrt
-			local skin_obj = skins.new("homedecor_clothes_"..skin_name..".png") -- Texture PNG file as key to be compatible in set_player_skin
+			local skin_obj = skins.new("homedecor_clothes_"..skin_name..".png")
+
 			skin_obj:set_preview("homedecor_clothes_"..skin_name.."_preview.png")
 			skin_obj:set_texture("homedecor_clothes_"..skin_name..".png")
 			skin_obj:set_meta("name", "Wardrobe "..skin_name)
 			skin_obj:set_meta("author", 'Calinou and Jordach')
 			skin_obj:set_meta("license", 'CC-by-SA-4.0')
-			local file = io.open(homedecor.modpath.."/textures/homedecor_clothes_"..skin_name..".png", "r")
+
+			local file = io.open(modpath ..
+				"/textures/homedecor_clothes_" .. skin_name .. ".png", "r")
+
 			skin_obj:set_meta("format", skins.get_skin_format(file))
+
 			file:close()
+
 			skin_obj:set_meta("in_inventory_list", false)
 		end
 	end
 end
 
-function homedecor.get_player_skin(player)
+local function get_player_skin(player)
+
 	local skin = player:get_attribute("homedecor:player_skin")
+
 	if not skin or skin == "" then
 		return default_skin, true
 	end
+
 	return skin, false
 end
 
-function homedecor.set_player_skin(player, skin, save)
+local function set_player_skin(player, skin, save)
+
 	if skinsdb_mod_path then
+
 		skins.set_player_skin(player, skin or skins.default)
+
 	elseif armor_mod_path then -- if 3D_armor's installed, let it set the skin
+
 		armor.textures[player:get_player_name()].skin = skin or default_skin
 		armor:update_player_visuals(player)
 	else
@@ -55,92 +70,143 @@ function homedecor.set_player_skin(player, skin, save)
 	end
 
 	if save and not skinsdb_mod_path then
+
 		if skin == default_skin then
 			skin = "default"
 			player:set_attribute("homedecor:player_skin", "")
 		else
 			player:set_attribute("homedecor:player_skin", skin)
 		end
-		if save == "player" then -- if player action
-			minetest.log("verbose",
-				S("player @1 sets skin to @2", player:get_player_name(), skin) ..
-				(armor_mod_path and ' [3d_armor]' or '')
-			)
-		end
 	end
 end
 
-function homedecor.unset_player_skin(player)
-	homedecor.set_player_skin(player, nil, true)
+local function unset_player_skin(player)
+	set_player_skin(player, nil, true)
 end
 
-homedecor.register("wardrobe", {
+local def = {
+
+	description = "Wardrobe",
+	drawtype = "mesh",
 	mesh = "homedecor_bedroom_wardrobe.obj",
 	tiles = {
-		homedecor.plain_wood,
+		{name = "homedecor_generic_wood_plain.png", color = 0xffa76820},
 		"homedecor_wardrobe_drawers.png",
 		"homedecor_wardrobe_doors.png"
 	},
 	inventory_image = "homedecor_wardrobe_inv.png",
-	description = S("Wardrobe"),
-	groups = {snappy=3},
+
+	paramtype = "light",
+	paramtype2 = "facedir",
+
+	groups = {snappy = 3},
 	selection_box = wd_cbox,
 	collision_box = wd_cbox,
 	sounds = default.node_sound_wood_defaults(),
-	expand = { top="placeholder" },
+
 	on_rotate = screwdriver.rotate_simple,
-	infotext = S("Wardrobe"),
-	inventory = {
-		size = 10
-	},
+
+	on_place = function(itemstack, placer, pointed_thing)
+
+		return homedecor.stack_vertically(itemstack, placer, pointed_thing,
+				itemstack:get_name(), "placeholder")
+	end,
+
+	can_dig = function(pos,player)
+
+		local meta = minetest.get_meta(pos)
+
+		return meta:get_inventory():is_empty("main")
+	end,
+
 	on_construct = function(pos)
+
 		local meta = minetest.get_meta(pos)
+
+		meta:set_string("infotext", "Wardrobe")
+
+		meta:get_inventory():set_size("main", 10)
+
 		-- textures made by the Minetest community (mostly Calinou and Jordach)
 		local clothes_strings = ""
-		for i = 1,5 do
-			clothes_strings = clothes_strings..
-			  "image_button_exit["..(i-1)..".5,0;1.1,2;homedecor_clothes_"..skinslist[i].."_preview.png;"..skinslist[i]..";]"..
-			  "image_button_exit["..(i-1)..".5,2;1.1,2;homedecor_clothes_fe"..skinslist[i].."_preview.png;fe"..skinslist[i]..";]"
+
+		for i = 1, 5 do
+
+			clothes_strings = clothes_strings ..
+				"image_button_exit[" .. (i-1) ..
+				".5,0;1.1,2;homedecor_clothes_" .. skinslist[i] ..
+				"_preview.png;" .. skinslist[i] .. ";]" ..
+				"image_button_exit[" .. (i-1) ..
+				".5,2;1.1,2;homedecor_clothes_fe" .. skinslist[i] ..
+				"_preview.png;fe" .. skinslist[i] .. ";]"
 		end
-		meta:set_string("formspec", "size[5.5,8.5]"..default.gui_bg..default.gui_bg_img..default.gui_slots..
-			"vertlabel[0,0.5;"..minetest.formspec_escape(S("Clothes")).."]"..
-			"button_exit[0,3.29;0.6,0.6;default;x]"..
-			clothes_strings..
-			"vertlabel[0,5.2;"..minetest.formspec_escape(S("Storage")).."]"..
-			"list[current_name;main;0.5,4.5;5,2;]"..
+
+		meta:set_string("formspec",  "size[5.5,8.5]" ..
+			default.gui_bg .. default.gui_bg_img .. default.gui_slots ..
+			"vertlabel[0,0.5;" .. minetest.formspec_escape("Clothes") .. "]" ..
+			"button_exit[0,3.29;0.6,0.6;default;x]" ..
+			clothes_strings ..
+			"vertlabel[0,5.2;" .. minetest.formspec_escape("Storage") .. "]" ..
+			"list[current_name;main;0.5,4.5;5,2;]" ..
 			"list[current_player;main;0.5,6.8;5,2;]" ..
-			"listring[]")
+			"listring[]"
+		)
 	end,
+
 	on_receive_fields = function(pos, formname, fields, sender)
+
 		if fields.default then
-			homedecor.set_player_skin(sender, nil, "player")
+
+			set_player_skin(sender, nil, "player")
+
 			return
 		end
 
-		for i = 1,5 do
+		for i = 1, 5 do
+
 			if fields[skinslist[i]] then
-				homedecor.set_player_skin(sender, "homedecor_clothes_"..skinslist[i]..".png", "player")
+
+				set_player_skin(sender,
+					"homedecor_clothes_" .. skinslist[i] .. ".png", "player")
 				break
-			elseif fields["fe"..skinslist[i]] then
-				homedecor.set_player_skin(sender, "homedecor_clothes_fe"..skinslist[i]..".png", "player")
+
+			elseif fields["fe" .. skinslist[i]] then
+
+				set_player_skin(sender,
+					"homedecor_clothes_fe" .. skinslist[i] .. ".png", "player")
 				break
 			end
 		end
 	end
-})
+}
+
+-- register the actual minetest node
+minetest.register_node(":homedecor:wardrobe", def)
 
 minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe")
 minetest.register_alias("homedecor:wardrobe_top", "air")
 
 if not skinsdb_mod_path then -- If not managed by skinsdb
+
 	minetest.register_on_joinplayer(function(player)
+
 		local skin = player:get_attribute("homedecor:player_skin")
 
 		if skin and skin ~= "" then
+
 			-- setting player skin on connect has no effect, so delay skin change
 			minetest.after(1, function(player, skin)
-				homedecor.set_player_skin(player, skin)
+				set_player_skin(player, skin)
 			end, player, skin)
 		end
 	end)
 end
+
+minetest.register_craft( {
+	output = "homedecor:wardrobe",
+	recipe = {
+		{ "homedecor:drawer_small", "homedecor:kitchen_cabinet" },
+		{ "homedecor:drawer_small", "default:wood" },
+		{ "homedecor:drawer_small", "default:wood" }
+	},
+})
diff --git a/homedecor/models/homedecor_bedroom_wardrobe.obj b/homedecor_wardrobe/models/homedecor_bedroom_wardrobe.obj
index 833158e..833158e 100644
--- a/homedecor/models/homedecor_bedroom_wardrobe.obj
+++ b/homedecor_wardrobe/models/homedecor_bedroom_wardrobe.obj
diff --git a/homedecor/textures/homedecor_clothes_female1.png b/homedecor_wardrobe/textures/homedecor_clothes_female1.png
index 7d52b2c..7d52b2c 100644
--- a/homedecor/textures/homedecor_clothes_female1.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female1.png
diff --git a/homedecor/textures/homedecor_clothes_female1_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_female1_preview.png
index 3d0fa6b..3d0fa6b 100644
--- a/homedecor/textures/homedecor_clothes_female1_preview.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female1_preview.png
diff --git a/homedecor/textures/homedecor_clothes_female2.png b/homedecor_wardrobe/textures/homedecor_clothes_female2.png
index 4244e35..4244e35 100644
--- a/homedecor/textures/homedecor_clothes_female2.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female2.png
diff --git a/homedecor/textures/homedecor_clothes_female2_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_female2_preview.png
index 9d3bc2b..9d3bc2b 100644
--- a/homedecor/textures/homedecor_clothes_female2_preview.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female2_preview.png
diff --git a/homedecor/textures/homedecor_clothes_female3.png b/homedecor_wardrobe/textures/homedecor_clothes_female3.png
index 7e09536..7e09536 100644
--- a/homedecor/textures/homedecor_clothes_female3.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female3.png
diff --git a/homedecor/textures/homedecor_clothes_female3_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_female3_preview.png
index 4a6ea13..4a6ea13 100644
--- a/homedecor/textures/homedecor_clothes_female3_preview.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female3_preview.png
diff --git a/homedecor_wardrobe/textures/homedecor_clothes_female4.png b/homedecor_wardrobe/textures/homedecor_clothes_female4.png
new file mode 100644
index 0000000..87c9e46
--- /dev/null
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female4.png
diff --git a/homedecor_wardrobe/textures/homedecor_clothes_female4_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_female4_preview.png
new file mode 100644
index 0000000..4a93933
--- /dev/null
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female4_preview.png
diff --git a/homedecor_wardrobe/textures/homedecor_clothes_female5.png b/homedecor_wardrobe/textures/homedecor_clothes_female5.png
new file mode 100644
index 0000000..be8d97c
--- /dev/null
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female5.png
diff --git a/homedecor_wardrobe/textures/homedecor_clothes_female5_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_female5_preview.png
new file mode 100644
index 0000000..4ebf47b
--- /dev/null
+++ b/homedecor_wardrobe/textures/homedecor_clothes_female5_preview.png
diff --git a/homedecor/textures/homedecor_clothes_male1.png b/homedecor_wardrobe/textures/homedecor_clothes_male1.png
index 614c71f..614c71f 100644
--- a/homedecor/textures/homedecor_clothes_male1.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male1.png
diff --git a/homedecor/textures/homedecor_clothes_male1_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_male1_preview.png
index c00be6b..c00be6b 100644
--- a/homedecor/textures/homedecor_clothes_male1_preview.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male1_preview.png
diff --git a/homedecor/textures/homedecor_clothes_male2.png b/homedecor_wardrobe/textures/homedecor_clothes_male2.png
index f7264b5..f7264b5 100644
--- a/homedecor/textures/homedecor_clothes_male2.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male2.png
diff --git a/homedecor/textures/homedecor_clothes_male2_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_male2_preview.png
index b3196c7..b3196c7 100644
--- a/homedecor/textures/homedecor_clothes_male2_preview.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male2_preview.png
diff --git a/homedecor/textures/homedecor_clothes_male3.png b/homedecor_wardrobe/textures/homedecor_clothes_male3.png
index 92d88f3..92d88f3 100644
--- a/homedecor/textures/homedecor_clothes_male3.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male3.png
diff --git a/homedecor/textures/homedecor_clothes_male3_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_male3_preview.png
index 2d0e187..2d0e187 100644
--- a/homedecor/textures/homedecor_clothes_male3_preview.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male3_preview.png
diff --git a/homedecor/textures/homedecor_clothes_male4.png b/homedecor_wardrobe/textures/homedecor_clothes_male4.png
index 53eaaa2..53eaaa2 100644
--- a/homedecor/textures/homedecor_clothes_male4.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male4.png
diff --git a/homedecor/textures/homedecor_clothes_male4_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_male4_preview.png
index feaf41d..feaf41d 100644
--- a/homedecor/textures/homedecor_clothes_male4_preview.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male4_preview.png
diff --git a/homedecor/textures/homedecor_clothes_male5.png b/homedecor_wardrobe/textures/homedecor_clothes_male5.png
index ac8caa8..ac8caa8 100644
--- a/homedecor/textures/homedecor_clothes_male5.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male5.png
diff --git a/homedecor/textures/homedecor_clothes_male5_preview.png b/homedecor_wardrobe/textures/homedecor_clothes_male5_preview.png
index 4036b1a..4036b1a 100644
--- a/homedecor/textures/homedecor_clothes_male5_preview.png
+++ b/homedecor_wardrobe/textures/homedecor_clothes_male5_preview.png
diff --git a/homedecor_wardrobe/textures/homedecor_generic_wood_plain.png b/homedecor_wardrobe/textures/homedecor_generic_wood_plain.png
new file mode 100644
index 0000000..04d3a91
--- /dev/null
+++ b/homedecor_wardrobe/textures/homedecor_generic_wood_plain.png
diff --git a/homedecor/textures/homedecor_wardrobe_doors.png b/homedecor_wardrobe/textures/homedecor_wardrobe_doors.png
index b9c73f2..b9c73f2 100644
--- a/homedecor/textures/homedecor_wardrobe_doors.png
+++ b/homedecor_wardrobe/textures/homedecor_wardrobe_doors.png
diff --git a/homedecor/textures/homedecor_wardrobe_drawers.png b/homedecor_wardrobe/textures/homedecor_wardrobe_drawers.png
index 270add6..270add6 100644
--- a/homedecor/textures/homedecor_wardrobe_drawers.png
+++ b/homedecor_wardrobe/textures/homedecor_wardrobe_drawers.png
diff --git a/homedecor/textures/homedecor_wardrobe_inv.png b/homedecor_wardrobe/textures/homedecor_wardrobe_inv.png
index 334f9a2..334f9a2 100644
--- a/homedecor/textures/homedecor_wardrobe_inv.png
+++ b/homedecor_wardrobe/textures/homedecor_wardrobe_inv.png
diff --git a/homedecor_windows_and_treatments/depends.txt b/homedecor_windows_and_treatments/depends.txt
new file mode 100644
index 0000000..8c8316a
--- /dev/null
+++ b/homedecor_windows_and_treatments/depends.txt
@@ -0,0 +1,5 @@
+homedecor_common
+default
+basic_materials
+unifieddyes
+building_blocks?
diff --git a/homedecor/window_treatments.lua b/homedecor_windows_and_treatments/init.lua
index c7eff50..04bc376 100644
--- a/homedecor/window_treatments.lua
+++ b/homedecor_windows_and_treatments/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 homedecor.register("window_quartered", {
 	description = S("Window (quartered)"),
@@ -99,7 +99,7 @@ homedecor.register("blinds_thin", {
 	selection_box = wb2_cbox
 })
 
-minetest.register_node("homedecor:curtain_closed", {
+minetest.register_node(":homedecor:curtain_closed", {
 	description = S("Curtains"),
 	tiles = { "homedecor_curtain.png" },
 	inventory_image = "homedecor_curtain.png",
@@ -126,7 +126,7 @@ minetest.register_node("homedecor:curtain_closed", {
 	end
 })
 
-minetest.register_node("homedecor:curtain_open", {
+minetest.register_node(":homedecor:curtain_open", {
 	description = S("Curtains (open)"),
 	tiles = { "homedecor_curtain_open.png" },
 	inventory_image = "homedecor_curtain_open.png",
@@ -211,6 +211,106 @@ homedecor.register("stained_glass", {
 	}
 })
 
+-- Various kinds of window shutters
+
+local shutters = {
+	"mahogany",
+	"red",
+	"yellow",
+	"forest_green",
+	"light_blue",
+	"violet",
+	"black",
+	"dark_grey",
+	"grey",
+	"white",
+}
+
+local shutter_cbox = {
+	type = "wallmounted",
+	wall_top =		{ -0.5,  0.4375, -0.5,  0.5,     0.5,    0.5 },
+	wall_bottom =	{ -0.5, -0.5,    -0.5,  0.5,    -0.4375, 0.5 },
+	wall_side =		{ -0.5, -0.5,    -0.5, -0.4375,  0.5,    0.5 }
+}
+
+local inv = "homedecor_window_shutter_inv.png^[colorize:#a87034:150"
+
+homedecor.register("shutter", {
+	mesh = "homedecor_window_shutter.obj",
+	tiles = {
+		{ name = "homedecor_window_shutter.png", color = 0xffa87034 }
+	},
+	description = S("Wooden Shutter"),
+	inventory_image = inv,
+	wield_image = inv,
+	paramtype2 = "colorwallmounted",
+	palette = "unifieddyes_palette_colorwallmounted.png",
+	airbrush_replacement_node = "homedecor:shutter_colored",
+	groups = { snappy = 3, ud_param2_colorable = 1 },
+	sounds = default.node_sound_wood_defaults(),
+	selection_box = shutter_cbox,
+	node_box = shutter_cbox,
+	after_place_node = function(pos, placer, itemstack, pointed_thing)
+		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+	end,
+})
+
+homedecor.register("shutter_colored", {
+	mesh = "homedecor_window_shutter.obj",
+	tiles = { "homedecor_window_shutter.png" },
+	description = S("Wooden Shutter"),
+	inventory_image = "homedecor_window_shutter_inv.png",
+	wield_image = "homedecor_window_shutter_inv.png",
+	paramtype2 = "colorwallmounted",
+	palette = "unifieddyes_palette_colorwallmounted.png",
+	groups = { snappy = 3 , not_in_creative_inventory = 1, ud_param2_colorable = 1},
+	sounds = default.node_sound_wood_defaults(),
+	selection_box = shutter_cbox,
+	node_box = shutter_cbox,
+	after_place_node = function(pos, placer, itemstack, pointed_thing)
+		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+	end,
+})
+
+minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")
+minetest.register_alias("homedecor:shutter_oak", "homedecor:shutter")
+
+-- convert old shutters to param2 coloring
+
+homedecor.old_shutter_nodes = {}
+
+for _, color in ipairs(shutters) do
+	table.insert(homedecor.old_shutter_nodes, "homedecor:shutter_"..color)
+end
+
+minetest.register_lbm({
+	name = ":homedecor:convert_shutters",
+	label = "Convert shutter static nodes to use param2 color",
+	run_at_every_load = false,
+	nodenames = homedecor.old_shutter_nodes,
+	action = function(pos, node)
+		local name = node.name
+		local color = string.sub(name, string.find(name, "_") + 1)
+
+		if color == "mahogany" then
+			color = "dark_red"
+		elseif color == "forest_green" then
+			color = "dark_green"
+		elseif color == "light_blue" then
+			color = "medium_cyan"
+		elseif color == "red" then
+			color = "medium_red"
+		end
+
+		local paletteidx = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted")
+		local param2 = paletteidx + node.param2
+
+		minetest.set_node(pos, { name = "homedecor:shutter_colored", param2 = param2 })
+		local meta = minetest.get_meta(pos)
+		meta:set_string("dye", "unifieddyes:"..color)
+	end
+})
+
 -- Convert old curtain nodes to param2-colorization
 
 local curtaincolors = {
@@ -230,7 +330,7 @@ for _, color in ipairs(curtaincolors) do
 end
 
 minetest.register_lbm({
-	name = "homedecor:convert_curtains",
+	name = ":homedecor:convert_curtains",
 	label = "Convert static curtain nodes to use param2 color",
 	run_at_every_load = false,
 	nodenames = homedecor.old_static_curtain_nodes,
@@ -258,3 +358,176 @@ minetest.register_lbm({
 		meta:set_string("dye", "unifieddyes:"..metadye)
 	end
 })
+
+-- crafting
+
+
+minetest.register_craft( {
+	output = "homedecor:shutter 2",
+	recipe = {
+		{ "group:stick", "group:stick" },
+		{ "group:stick", "group:stick" },
+		{ "group:stick", "group:stick" },
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:shutter_colored",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:shutter",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+minetest.register_craft({
+        type = "fuel",
+        recipe = "homedecor:shutter_oak",
+        burntime = 30,
+})
+
+
+minetest.register_craft( {
+	output = "homedecor:curtain_closed 4",
+		recipe = {
+		{ "wool:white", "", ""},
+		{ "wool:white", "", ""},
+		{ "wool:white", "", ""},
+	},
+})
+
+minetest.register_craft( {
+	output = "homedecor:curtain_closed 4",
+		recipe = {
+		{ "cottages:wool", "", ""},
+		{ "cottages:wool", "", ""},
+		{ "cottages:wool", "", ""},
+	},
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:curtain_closed",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:curtain_closed",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "homedecor:curtain_open",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "homedecor:curtain_open",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+local mats = {
+	{ "brass", "homedecor:pole_brass" },
+	{ "wrought_iron", "homedecor:pole_wrought_iron" },
+	{ "wood", "group:stick" }
+}
+
+for i in ipairs(mats) do
+	local material = mats[i][1]
+	local ingredient = mats[i][2]
+	minetest.register_craft( {
+		output = "homedecor:curtainrod_"..material.." 3",
+		recipe = {
+			{ ingredient, ingredient, ingredient },
+		},
+	})
+end
+
+minetest.register_craft({
+	type = "shapeless",
+    output = "homedecor:window_plain 8",
+    recipe = {
+		"dye:white",
+		"dye:white",
+		"dye:white",
+		"dye:white",
+		"building_blocks:woodglass"
+    }
+})
+
+minetest.register_craft({
+	type = "shapeless",
+    output = "homedecor:window_quartered",
+    recipe = {
+		"dye:white",
+		"group:stick",
+		"group:stick",
+		"homedecor:window_plain"
+    }
+})
+
+minetest.register_craft({
+    output = "homedecor:blinds_thin",
+    recipe = {
+		{ "group:stick", "basic_materials:plastic_sheet", "group:stick" },
+		{ "farming:string", "basic_materials:plastic_strip", "" },
+		{ "", "basic_materials:plastic_strip", "" },
+    },
+})
+
+minetest.register_craft({
+    output = "homedecor:blinds_thick",
+    recipe = {
+		{ "group:stick", "basic_materials:plastic_sheet", "group:stick" },
+		{ "farming:string", "basic_materials:plastic_strip", "basic_materials:plastic_strip" },
+		{ "", "basic_materials:plastic_strip", "basic_materials:plastic_strip" },
+    },
+})
+
+minetest.register_craft( {
+        output = "homedecor:window_flowerbox",
+        recipe = {
+                { "homedecor:roof_tile_terracotta", "default:dirt", "homedecor:roof_tile_terracotta" },
+                { "", "homedecor:roof_tile_terracotta", "" },
+        },
+})
+
+minetest.register_craft({
+	output = "homedecor:stained_glass 8",
+	recipe = {
+		{"", "dye:blue", ""},
+		{"dye:red", "default:glass", "dye:green"},
+		{"", "dye:yellow", ""},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:stained_glass 3",
+	recipe = {
+		{"", "dye:blue", ""},
+		{"dye:red", "xpanes:pane_flat", "dye:green"},
+		{"", "dye:yellow", ""},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:stained_glass 2",
+	recipe = {
+		{"", "dye:blue", ""},
+		{"dye:red", "cottages:glass_pane_side", "dye:green"},
+		{"", "dye:yellow", ""},
+	},
+})
+
+minetest.register_craft({
+	output = "homedecor:stained_glass 2",
+	recipe = {
+		{"", "dye:blue", ""},
+		{"dye:red", "cottages:glass_pane", "dye:green"},
+		{"", "dye:yellow", ""},
+	},
+})
+
diff --git a/homedecor/models/homedecor_window_shutter.obj b/homedecor_windows_and_treatments/models/homedecor_window_shutter.obj
index 4080c6c..4080c6c 100644
--- a/homedecor/models/homedecor_window_shutter.obj
+++ b/homedecor_windows_and_treatments/models/homedecor_window_shutter.obj
diff --git a/homedecor/models/homedecor_windowblind_thick.obj b/homedecor_windows_and_treatments/models/homedecor_windowblind_thick.obj
index ebf824e..ebf824e 100644
--- a/homedecor/models/homedecor_windowblind_thick.obj
+++ b/homedecor_windows_and_treatments/models/homedecor_windowblind_thick.obj
diff --git a/homedecor/models/homedecor_windowblind_thin.obj b/homedecor_windows_and_treatments/models/homedecor_windowblind_thin.obj
index 002e162..002e162 100644
--- a/homedecor/models/homedecor_windowblind_thin.obj
+++ b/homedecor_windows_and_treatments/models/homedecor_windowblind_thin.obj
diff --git a/homedecor/textures/homedecor_curtain.png b/homedecor_windows_and_treatments/textures/homedecor_curtain.png
index 4274d2b..4274d2b 100644
--- a/homedecor/textures/homedecor_curtain.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_curtain.png
diff --git a/homedecor/textures/homedecor_curtain_open.png b/homedecor_windows_and_treatments/textures/homedecor_curtain_open.png
index e593d06..e593d06 100644
--- a/homedecor/textures/homedecor_curtain_open.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_curtain_open.png
diff --git a/homedecor/textures/homedecor_curtainrod_brass_inv.png b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_brass_inv.png
index a2ffacf..a2ffacf 100644
--- a/homedecor/textures/homedecor_curtainrod_brass_inv.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_brass_inv.png
diff --git a/homedecor/textures/homedecor_curtainrod_wood_inv.png b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_wood_inv.png
index 5712d36..5712d36 100644
--- a/homedecor/textures/homedecor_curtainrod_wood_inv.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_wood_inv.png
diff --git a/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_wrought_iron_inv.png
index 914fc7f..914fc7f 100644
--- a/homedecor/textures/homedecor_curtainrod_wrought_iron_inv.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_curtainrod_wrought_iron_inv.png
diff --git a/homedecor/textures/homedecor_flowerbox_bottom.png b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_bottom.png
index 665cdc6..665cdc6 100644
--- a/homedecor/textures/homedecor_flowerbox_bottom.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_bottom.png
diff --git a/homedecor/textures/homedecor_flowerbox_inv.png b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_inv.png
index 7a5cfee..7a5cfee 100644
--- a/homedecor/textures/homedecor_flowerbox_inv.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_inv.png
diff --git a/homedecor/textures/homedecor_flowerbox_sides.png b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_sides.png
index 414afad..414afad 100644
--- a/homedecor/textures/homedecor_flowerbox_sides.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_sides.png
diff --git a/homedecor/textures/homedecor_flowerbox_top.png b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_top.png
index 11ade60..11ade60 100644
--- a/homedecor/textures/homedecor_flowerbox_top.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_flowerbox_top.png
diff --git a/homedecor/textures/homedecor_stained_glass.png b/homedecor_windows_and_treatments/textures/homedecor_stained_glass.png
index 43e86bc..43e86bc 100644
--- a/homedecor/textures/homedecor_stained_glass.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_stained_glass.png
diff --git a/homedecor/textures/homedecor_window_frame.png b/homedecor_windows_and_treatments/textures/homedecor_window_frame.png
index 7209ace..7209ace 100644
--- a/homedecor/textures/homedecor_window_frame.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_window_frame.png
diff --git a/homedecor/textures/homedecor_window_quartered.png b/homedecor_windows_and_treatments/textures/homedecor_window_quartered.png
index 6d42b95..6d42b95 100644
--- a/homedecor/textures/homedecor_window_quartered.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_window_quartered.png
diff --git a/homedecor/textures/homedecor_window_shutter.png b/homedecor_windows_and_treatments/textures/homedecor_window_shutter.png
index 47cdf7b..47cdf7b 100644
--- a/homedecor/textures/homedecor_window_shutter.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_window_shutter.png
diff --git a/homedecor/textures/homedecor_window_shutter_inv.png b/homedecor_windows_and_treatments/textures/homedecor_window_shutter_inv.png
index fd77e81..fd77e81 100644
--- a/homedecor/textures/homedecor_window_shutter_inv.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_window_shutter_inv.png
diff --git a/homedecor/textures/homedecor_window_sides.png b/homedecor_windows_and_treatments/textures/homedecor_window_sides.png
index dc1ad37..dc1ad37 100644
--- a/homedecor/textures/homedecor_window_sides.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_window_sides.png
diff --git a/homedecor/textures/homedecor_windowblind_strings.png b/homedecor_windows_and_treatments/textures/homedecor_windowblind_strings.png
index 78b9568..78b9568 100644
--- a/homedecor/textures/homedecor_windowblind_strings.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_windowblind_strings.png
diff --git a/homedecor/textures/homedecor_windowblind_thick_inv.png b/homedecor_windows_and_treatments/textures/homedecor_windowblind_thick_inv.png
index 63c2ded..63c2ded 100644
--- a/homedecor/textures/homedecor_windowblind_thick_inv.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_windowblind_thick_inv.png
diff --git a/homedecor/textures/homedecor_windowblind_thin_inv.png b/homedecor_windows_and_treatments/textures/homedecor_windowblind_thin_inv.png
index 5e70dfe..5e70dfe 100644
--- a/homedecor/textures/homedecor_windowblind_thin_inv.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_windowblind_thin_inv.png
diff --git a/homedecor/textures/homedecor_windowblinds.png b/homedecor_windows_and_treatments/textures/homedecor_windowblinds.png
index fc4ea6b..fc4ea6b 100644
--- a/homedecor/textures/homedecor_windowblinds.png
+++ b/homedecor_windows_and_treatments/textures/homedecor_windowblinds.png
diff --git a/hotbar/init.lua b/hotbar/init.lua
index 81b0518..a2f4de2 100644
--- a/hotbar/init.lua
+++ b/hotbar/init.lua
@@ -6,6 +6,8 @@ local function validate_size(s)
 	if (size == 8 or size == 16 or size == 23 or size == 24 or size == 32)
 	  and size <= maxslots then
 		return size
+	else
+		return 16
 	end
 end
 
@@ -51,7 +53,7 @@ minetest.register_chatcommand("hotbar", {
 	params = "[size]",
 	description = "Sets the size of your hotbar",
 	func = function(name, slots)
-		hotbar_size = validate_size(tonumber(slots))
+		local hotbar_size = validate_size(tonumber(slots))
 		player_hotbar_settings[name] = hotbar_size
 		local player = minetest.get_player_by_name(name)
 		player:hud_set_hotbar_itemcount(hotbar_size)
diff --git a/inbox/depends.txt b/inbox/depends.txt
index ace758c..e13666d 100644
--- a/inbox/depends.txt
+++ b/inbox/depends.txt
@@ -1,3 +1,3 @@
 default
-homedecor_i18n
+homedecor_common
 screwdriver?
diff --git a/inbox/init.lua b/inbox/init.lua
index 5ee77a8..29c1745 100644
--- a/inbox/init.lua
+++ b/inbox/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local inbox = {}
 local screwdriver = rawget(_G, "screwdriver") or {}
diff --git a/inspector/depends.txt b/inspector/depends.txt
new file mode 100644
index 0000000..b75ab62
--- /dev/null
+++ b/inspector/depends.txt
@@ -0,0 +1 @@
+fsc
diff --git a/inspector/init.lua b/inspector/init.lua
index b095964..4b4b711 100644
--- a/inspector/init.lua
+++ b/inspector/init.lua
@@ -20,7 +20,6 @@ end
 
 local function inspect_pos(pos)
 	local node = minetest.get_node(pos)
-
 	local desc = "===== node data =====\n"
 	desc = desc .. "name = " .. node.name .. "\n"
 	desc = desc .. "param1 = " .. node.param1 .. "\n"
@@ -31,19 +30,19 @@ local function inspect_pos(pos)
 	end
 
 	local timer = minetest.get_node_timer(pos)
-		if timer:get_timeout() ~= 0 then
-		desc = desc .. "==== node timer ====\n"
-		desc = desc .. "timeout = " .. timer:get_timeout() .. "\n"
-		desc = desc .. "elapsed = " .. timer:get_elapsed() .. "\n"
+	if timer:get_timeout() ~= 0 then
+	desc = desc .. "==== node timer ====\n"
+	desc = desc .. "timeout = " .. timer:get_timeout() .. "\n"
+	desc = desc .. "elapsed = " .. timer:get_elapsed() .. "\n"
 	end
 
+	local nodedef = minetest.registered_items[node.name]
 	local meta = minetest.get_meta(pos)
 	local table = meta:to_table()
 	local fields = minetest.serialize(table.fields)
 	desc = desc .. "==== meta ====\n"
 	desc = desc .. "meta.fields = " .. fields .. "\n"
 	desc = desc .. "\n"
-
 	local inventory = meta:get_inventory()
 	desc = desc .. "meta.inventory = \n"
 	for key, list in pairs(inventory:get_lists()) do
@@ -57,13 +56,12 @@ local function inspect_pos(pos)
 		end
 	end
 
-	local nodedef = minetest.registered_items[node.name]
 	if nodedef then  -- Some built in nodes have no nodedef
 		desc = desc .. "==== nodedef ====\n"
 		desc = desc .. dump(nodedef) .. "\n"
 	end
 
-	return minetest.formspec_escape(desc:gsub(",", "\\,"))
+	return desc
 end
 
 minetest.register_tool("inspector:inspector", {
@@ -74,12 +72,9 @@ minetest.register_tool("inspector:inspector", {
 	on_use = function(itemstack, user, pointed_thing)
 
 		local desc = ""
-		local title = ""
 		if pointed_thing.type == "nothing" then
 			return
 		elseif pointed_thing.type == "node" then
-			title = "Node information"
-
 			local pos = pointed_thing.under
 
 			if pointed_thing.type ~= "node" then
@@ -87,18 +82,47 @@ minetest.register_tool("inspector:inspector", {
 			else
 				desc = inspect_pos(pos)
 			end
-
 		elseif pointed_thing.type == "object" then
-			title = "Object information"
-
 			local ref = pointed_thing.ref
 			local entity = ref:get_luaentity()
-			desc = minetest.formspec_escape(dump(entity):gsub("\n\n", "\n"))
-
+			desc = dump(entity)
 		end
 
-		minetest.show_formspec(user:get_player_name(), "inspector:inspector", make_fs(title, desc))
+		local formspec = "size[12,8]"..
+				 "label[0.5,0.5;Node Information]"..
+				 "textarea[0.5,1.5;11.5,7;text;Contents:;"..
+				 minetest.formspec_escape(desc).."]"..
+				 "button_exit[2.5,7.5;3,1;close;Close]"
+
+		fsc.show(user:get_player_name(), formspec, {}, function() end)
 	end,
+	on_place = function(itemstack, user, pointed_thing)
+
+		local desc = ""
+		if pointed_thing.type == "nothing" then
+			return
+		elseif pointed_thing.type == "node" then
+			local pos = pointed_thing.above
+
+			if pointed_thing.type ~= "node" then
+				desc = "..."
+			else
+				desc = inspect_pos(pos)
+			end
+		elseif pointed_thing.type == "object" then
+			local ref = pointed_thing.ref
+			local entity = ref:get_luaentity()
+			desc = dump(entity)
+		end
+
+		local formspec = "size[12,8]"..
+				 "label[0.5,0.5;Node Information]"..
+				 "textarea[0.5,1.5;11.5,7;text;Contents:;"..
+				 minetest.formspec_escape(desc).."]"..
+				 "button_exit[2.5,7.5;3,1;close;Close]"
+
+		fsc.show(user:get_player_name(), formspec, {}, function() end)
+	end
 })
 
 minetest.register_chatcommand("inspect", {
@@ -107,11 +131,21 @@ minetest.register_chatcommand("inspect", {
 	privs = {server = true},
 	func = function(name, param)
 		local paramlist = {}
-		for k in string.gmatch(param, "[^%s]+") do table.insert(paramlist, k) end
+		for p in string.gmatch(param, "%S+") do
+			paramlist[#paramlist + 1] = p
+		end
 		local pos = {x = paramlist[1], y = paramlist[2], z = paramlist[3]}
+		if not pos.x or not pos.y or not pos.z then
+			return false, "Need 3 parameters for X, Y and Z"
+		end
 		local desc = inspect_pos(pos)
+		local formspec = "size[12,8]"..
+							 "label[0.5,0.5;Node Information]"..
+							 "textarea[0.5,1.5;11.5,7;text;Contents:;"..
+							 minetest.formspec_escape(desc).."]"..
+							 "button_exit[2.5,7.5;3,1;close;Close]"
 
-		minetest.show_formspec(name, "inspector:inspector", make_fs("Node information", desc))
+		fsc.show(name, formspec, {}, function() end)
 		return true
 	end,
 })
diff --git a/inspector/mod.conf b/inspector/mod.conf
index 26227c6..d2898c0 100644
--- a/inspector/mod.conf
+++ b/inspector/mod.conf
@@ -1 +1,3 @@
 name = inspector
+description = An in-game tool to inspect node parameters and metadata.
+depends = fsc
diff --git a/inspector/screenshot.png b/inspector/screenshot.png
new file mode 100644
index 0000000..fc64fb2
--- /dev/null
+++ b/inspector/screenshot.png
diff --git a/itemframes/depends.txt b/itemframes/depends.txt
index 29ebd95..ae7019b 100644
--- a/itemframes/depends.txt
+++ b/itemframes/depends.txt
@@ -1,3 +1,3 @@
 default
-homedecor_i18n
+homedecor_common
 mesecons_mvps?
diff --git a/itemframes/init.lua b/itemframes/init.lua
index 21fac2f..d424c38 100644
--- a/itemframes/init.lua
+++ b/itemframes/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local tmp = {}
 screwdriver = screwdriver or {}
@@ -299,4 +299,4 @@ minetest.register_craft({
 if minetest.get_modpath("mesecons_mvps") then
 	mesecon.register_mvps_stopper("itemframes:frame")
 	mesecon.register_mvps_stopper("itemframes:pedestal")
-end
\ No newline at end of file
+end
diff --git a/lavalamp/depends.txt b/lavalamp/depends.txt
index 9944202..bbc40a7 100644
--- a/lavalamp/depends.txt
+++ b/lavalamp/depends.txt
@@ -1,4 +1,4 @@
 wool
 bucket
-homedecor_i18n
+homedecor_common
 unifieddyes
diff --git a/lavalamp/init.lua b/lavalamp/init.lua
index 756bf1d..fd1a815 100644
--- a/lavalamp/init.lua
+++ b/lavalamp/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 lavalamp = {}
 
diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua
index fcb84e5..6950cad 100644
--- a/lrfurn/armchairs.lua
+++ b/lrfurn/armchairs.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 local armchair_cbox = {
 	type = "fixed",
 	fixed = {
diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua
index 827657a..8b095ce 100644
--- a/lrfurn/coffeetable.lua
+++ b/lrfurn/coffeetable.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable")
 minetest.register_alias("lrfurn:coffeetable_front", "air")
diff --git a/lrfurn/depends.txt b/lrfurn/depends.txt
index 973de17..398a410 100644
--- a/lrfurn/depends.txt
+++ b/lrfurn/depends.txt
@@ -1,4 +1,4 @@
 default
 wool
-homedecor_i18n
+homedecor_common
 unifieddyes
diff --git a/lrfurn/endtable.lua b/lrfurn/endtable.lua
index a318376..470e907 100644
--- a/lrfurn/endtable.lua
+++ b/lrfurn/endtable.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 minetest.register_node("lrfurn:endtable", {
 	description = S("End Table"),
diff --git a/lrfurn/init.lua b/lrfurn/init.lua
index 631e79a..a23aff4 100644
--- a/lrfurn/init.lua
+++ b/lrfurn/init.lua
@@ -1,4 +1,4 @@
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 lrfurn = {}
 screwdriver = screwdriver or {}
diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua
index eeb3ca2..2df177c 100644
--- a/lrfurn/longsofas.lua
+++ b/lrfurn/longsofas.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local longsofa_cbox = {
 	type = "wallmounted",
diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua
index 6f89bea..7d1cd53 100644
--- a/lrfurn/sofas.lua
+++ b/lrfurn/sofas.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 local sofa_cbox = {
 	type = "wallmounted",
diff --git a/maptools/CHANGELOG.md b/maptools/CHANGELOG.md
index 2892512..900458e 100644
--- a/maptools/CHANGELOG.md
+++ b/maptools/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
+- The minimum supported Minetest version is now 5.0.0.
+
 ## [1.1.0] - 2019-03-23
 
 ### Changed
diff --git a/maptools/config.lua b/maptools/config.lua
index 56d0e2d..466491e 100644
--- a/maptools/config.lua
+++ b/maptools/config.lua
@@ -8,7 +8,7 @@ Licensed under the zlib license. See LICENSE.md for more information.
 maptools.config = {}
 
 local function getbool_default(setting, default)
-	local value = minetest.setting_getbool(setting)
+	local value = minetest.settings:get_bool(setting)
 	if value == nil then
 		value = default
 	end
@@ -21,7 +21,7 @@ local function setting(settingtype, name, default)
 			getbool_default("maptools." .. name, default)
 	else
 		maptools.config[name] =
-			minetest.setting_get("maptools." .. name) or default
+			minetest.settings:get("maptools." .. name) or default
 	end
 end
 
diff --git a/maptools/depends.txt b/maptools/depends.txt
deleted file mode 100644
index 9207dab..0000000
--- a/maptools/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-intllib?
diff --git a/maptools/description.txt b/maptools/description.txt
deleted file mode 100644
index 43bbfde..0000000
--- a/maptools/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Adds various special versions of normal blocks, tools, and other map maintainer tools.
diff --git a/maptools/init.lua b/maptools/init.lua
index a7ae4a5..c8d5336 100644
--- a/maptools/init.lua
+++ b/maptools/init.lua
@@ -27,7 +27,3 @@ maptools.drop_msg = function(itemstack, player)
 	local name = player:get_player_name()
 	minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!"))
 end
-
-if minetest.setting_getbool("log_mods") then
-	minetest.log("action", S("[maptools] loaded."))
-end
diff --git a/maptools/mod.conf b/maptools/mod.conf
index a77ffe2..363f651 100644
--- a/maptools/mod.conf
+++ b/maptools/mod.conf
@@ -1 +1,4 @@
 name = maptools
+description = Adds various special versions of normal blocks, tools, and other map maintainer tools.
+depends = default
+optional_depends = intllib
diff --git a/mesecons_noteblock/doc/noteblock/description.html b/mesecons_noteblock/doc/noteblock/description.html
index 729bfe1..c2cfaf0 100644
--- a/mesecons_noteblock/doc/noteblock/description.html
+++ b/mesecons_noteblock/doc/noteblock/description.html
@@ -5,7 +5,6 @@ This effector makes a sound if powered and can be used for making music. Normall
 <tr><td>Stone</td><td>Kick</td></tr>
 <tr><td>Chest</td><td>Snare</td></tr>
 <tr><td>Tree</td><td>Crash</td></tr>
-<tr><td>Glass</td><td>Hihat</td></tr>
 <tr><td>Wood</td><td>Lite Crash</td></tr>
 <tr><td>Coal Block</td><td>Explosion Sound </td></tr>
 <tr><td>Lava Source</td><td>Fire Sound</td></tr>
diff --git a/moreblocks/CHANGELOG.md b/moreblocks/CHANGELOG.md
index 154f885..9c69a0a 100644
--- a/moreblocks/CHANGELOG.md
+++ b/moreblocks/CHANGELOG.md
@@ -9,8 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+- `settingtypes.txt` file to allow configuring settings in the main menu.
 - Polish translation.
 
+### Changed
+
+- The minimum supported Minetest version is now 5.0.0.
+
 ## [1.3.0] - 2019-03-23
 
 ### Changed
diff --git a/moreblocks/circular_saw.lua b/moreblocks/circular_saw.lua
index 9395a2e..7fd9016 100644
--- a/moreblocks/circular_saw.lua
+++ b/moreblocks/circular_saw.lua
@@ -152,7 +152,7 @@ function circular_saw:update_inventory(pos, amount)
 
 	amount = meta:get_int("anz") + amount
 
-	-- The material is recycled automaticly.
+	-- The material is recycled automatically.
 	inv:set_list("recycle",  {})
 
 	if amount < 1 then -- If the last block is taken out.
@@ -246,7 +246,7 @@ function circular_saw.allow_metadata_inventory_put(
 	local stackname = stack:get_name()
 	local count = stack:get_count()
 
-	-- Only alow those items that are offered in the output inventory to be recycled:
+	-- Only allow those items that are offered in the output inventory to be recycled:
 	if listname == "recycle" then
 		if not inv:contains_item("output", stackname) then
 			return 0
@@ -345,7 +345,7 @@ function circular_saw.on_metadata_inventory_take(
 	end
 
 	-- If it is one of the offered stairs: find out how many
-	-- microblocks have to be substracted:
+	-- microblocks have to be subtracted:
 	if listname == "output" then
 		-- We do know how much each block at each position costs:
 		local cost = circular_saw.cost_in_microblocks[index]
diff --git a/moreblocks/depends.txt b/moreblocks/depends.txt
deleted file mode 100644
index d27d8a5..0000000
--- a/moreblocks/depends.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-default
-intllib?
-stairs?
-farming?
-wool?
-basic_materials?
diff --git a/moreblocks/description.txt b/moreblocks/description.txt
deleted file mode 100644
index 95d7a92..0000000
--- a/moreblocks/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Adds various miscellaneous blocks to the game.
diff --git a/moreblocks/init.lua b/moreblocks/init.lua
index 7627f7d..2416a03 100644
--- a/moreblocks/init.lua
+++ b/moreblocks/init.lua
@@ -23,7 +23,3 @@ dofile(modpath .. "/nodes.lua")
 dofile(modpath .. "/redefinitions.lua")
 dofile(modpath .. "/crafting.lua")
 dofile(modpath .. "/aliases.lua")
-
-if minetest.settings:get_bool("log_mods") then
-	minetest.log("action", S("[moreblocks] loaded."))
-end
diff --git a/moreblocks/mod.conf b/moreblocks/mod.conf
index b634ba9..31f7f79 100644
--- a/moreblocks/mod.conf
+++ b/moreblocks/mod.conf
@@ -1 +1,4 @@
 name = moreblocks
+description = Adds various miscellaneous blocks to the game.
+depends = default
+optional_depends = intllib,stairs,farming,wool,basic_materials
diff --git a/moreblocks/settingtypes.txt b/moreblocks/settingtypes.txt
new file mode 100644
index 0000000..e60f394
--- /dev/null
+++ b/moreblocks/settingtypes.txt
@@ -0,0 +1 @@
+moreblocks.stairsplus_in_creative_inventory (Display Stairs+ nodes in creative inventory) bool false
diff --git a/moreblocks/stairsplus/API.md b/moreblocks/stairsplus/API.md
index b5cb0c1..c0fea32 100644
--- a/moreblocks/stairsplus/API.md
+++ b/moreblocks/stairsplus/API.md
@@ -6,7 +6,7 @@
 	This also registers the node with the circular saw.
 	Example:
 	```lua
-	stairsplus:register_all("moreblocks", "wood", "defaut:wood", {
+	stairsplus:register_all("moreblocks", "wood", "default:wood", {
 		description = "Wooden",
 		tiles = {"default_wood.png"},
 		groups = {oddly_breakabe_by_hand=1},
diff --git a/moreores/CHANGELOG.md b/moreores/CHANGELOG.md
index e386b83..1363aba 100644
--- a/moreores/CHANGELOG.md
+++ b/moreores/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Polish translation.
 
+### Changed
+
+- The minimum supported Minetest version is now 5.0.0.
+
 ## [1.1.0] - 2019-03-23
 
 ### Added
diff --git a/moreores/depends.txt b/moreores/depends.txt
deleted file mode 100644
index 6c8d8d7..0000000
--- a/moreores/depends.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-default
-farming?
-intllib?
-mg?
diff --git a/moreores/description.txt b/moreores/description.txt
deleted file mode 100644
index 6bd1c7c..0000000
--- a/moreores/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Adds new Ore types.
diff --git a/moreores/init.lua b/moreores/init.lua
index e389778..d3b1cc0 100644
--- a/moreores/init.lua
+++ b/moreores/init.lua
@@ -382,7 +382,3 @@ for orename, def in pairs(oredefs) do
 	-- Register everything
 	add_ore("moreores", def.description, orename, def)
 end
-
-if minetest.settings:get_bool("log_mods") then
-	minetest.log("action", S("[moreores] loaded."))
-end
diff --git a/moreores/mod.conf b/moreores/mod.conf
index 5a9f1e2..2b96161 100644
--- a/moreores/mod.conf
+++ b/moreores/mod.conf
@@ -1 +1,4 @@
 name = moreores
+description = Adds new ore types.
+depends = default
+optional_depends = farming,intllib,mg
diff --git a/plasmascreen/depends.txt b/plasmascreen/depends.txt
index 7b3e79f..5a0ba06 100644
--- a/plasmascreen/depends.txt
+++ b/plasmascreen/depends.txt
@@ -1,2 +1,3 @@
 default
-homedecor
+homedecor_common
+homedecor_electronics
diff --git a/plasmascreen/init.lua b/plasmascreen/init.lua
index 183d1f9..37ec395 100644
--- a/plasmascreen/init.lua
+++ b/plasmascreen/init.lua
@@ -1,5 +1,5 @@
 
-local S = homedecor_i18n.gettext
+local S = homedecor.gettext
 
 screwdriver = screwdriver or {}
 
diff --git a/player_textures/init.lua b/player_textures/init.lua
index 5f2fb48..9bfe5ba 100644
--- a/player_textures/init.lua
+++ b/player_textures/init.lua
@@ -22,5 +22,4 @@ end
 
 minetest.register_on_joinplayer(function(player)
 	applyskin(player)
-	minetest.after(10,applyskin,player)
 end)
diff --git a/player_textures/textures/player_oOChainLynxOo.png b/player_textures/textures/player_oOChainLynxOo.png
index 6987918..439c407 100644
--- a/player_textures/textures/player_oOChainLynxOo.png
+++ b/player_textures/textures/player_oOChainLynxOo.png
diff --git a/ropes/extendingladder.lua b/ropes/extendingladder.lua
index c804ac2..01d1563 100644
--- a/ropes/extendingladder.lua
+++ b/ropes/extendingladder.lua
@@ -53,6 +53,11 @@ minetest.register_craft({
 
 
 local ladder_extender = function(pos, node, clicker, itemstack, pointed_thing, ladder_node, standing_limit)
+	-- on_rightclick can be called by other mods, make sure we have all the parameters we need
+	if pointed_thing == nil or itemstack == nil then
+		return itemstack
+	end
+
 	local clicked_stack = ItemStack(itemstack)
 	
 	-- true if we're pointing up at the ladder from below and there's a buildable space below it
diff --git a/technic/locale/pl.txt b/technic/locale/pl.txt
index 7fe29fb..663f807 100644
--- a/technic/locale/pl.txt
+++ b/technic/locale/pl.txt
@@ -37,17 +37,17 @@ Machine cannot be removed because it is not empty = Nie można usunąć maszyny,
 Inventory move disallowed due to protection = Przenoszenie rzeczy z ekwipunku niemożliwe z powodu ochrony
 # $1: Machine name (Includes tier)
 @1 Active (@2 EU) = @1 Aktywny (@2 EU)
-%s Active = %s Aktywny
-%s Disabled = %s Wyłączony
-%s Enabled = %s Włączony
-%s Idle = %s Bezczynny
-%s Improperly Placed = %s Ustawiony nieprawidłowo
-%s is empty = %s jest pusty
+%s Active = %s Aktywny/a
+%s Disabled = %s Wyłączony/a
+%s Enabled = %s Włączony/a
+%s Idle = %s Bezczynny/a
+%s Improperly Placed = %s Ustawiony/a nieprawidłowo
+%s is empty = %s jest pusty/a
 %s Unpowered = %s brak zasilania
 %s Out Of Fuel = %s brak paliwa
 %s Has Bad Cabling = %s Źle podłączono kable
 %s (Slave) =
-%s Has No Network = %s Nie podłączony do sieci
+%s Has No Network = %s Nie podłączony/a do sieci
 %s Finished = %s Ukończony
 Enable/Disable = Włącz/Wyłącz
 Range = Zasięg
@@ -60,17 +60,17 @@ Stackwise = Cały stack
 Ignoring Mesecon Signal = Ignoruj sygnał Mesecon
 Controlled by Mesecon Signal = Sterowany sygnałem Mesecon
 Owner: = Właściciel:
-Unlocked = Odblokowany
-Locked = Zablokowany
+Unlocked = Odblokowany/a
+Locked = Zablokowany/a
 Radius: = Promień:
-Enabled = Włączony
-Disabled = Wyłączony
+Enabled = Włączony/a
+Disabled = Wyłączony/a
 
 ## Machine names
 # $1: Tier
 %s Alloy Furnace = %s Piec stopowy
 %s Battery Box = %s Skrzynka baterii
-%s Cable = %s Kabel
+%s Cable = %s Przewód
 %s Centrifuge = %s Centryfuga
 %s Compressor = %s Kompresor
 %s Extractor = %s Ekstraktor
@@ -118,7 +118,7 @@ Production at %d%% = Produkowanie w %d%%
 Choose Milling Program: = Wybierz program mielenia:
 Slim Elements half / normal height: = Małe elementy połowa / normalna wysokość:
 Current track %s =
-Stopped = Zatrzymany
+Stopped = Zatrzymany/a
 Keeping %d/%d map blocks loaded = Ciągle ładuję %d/%d bloki mapy 
 Digging not started = Nie rozpoczęto kopania
 Digging finished = Kopanie skończone
@@ -126,29 +126,28 @@ Digging %d m above machine = Kopię %d m nad maszyną
 Digging %d m below machine = Kopię %d m pod maszyną
 @1 (@2 @3 -> @4 @5) = @1 (@2 @3 -> @4 @5)
 
-
 ## Grinder Recipes
 # $1: Name
 %s Dust = %s Pył
-Akalin = Akalin
-Alatro = Alatro
-Arol = Arol
-Brass = Mosiądz
-Bronze = Brąz
-Carbon Steel = Stal węglowa
-Cast Iron = Żeliwo
-Chromium = Chrom
-Coal = Węgiel
-Copper = Miedź
-Gold = Złoto
-Mithril = Mithril
-Silver = Srebro
-Stainless Steel = Stal nierdzewna
-Talinite = Talinit
-Tin = Cyna
-Wrought Iron = Kute żelazo
-Zinc = Cynk
-%.1f%%-Fissile Uranium = %.1f%% Uran
+Akalin = Akalinowy
+Alatro = Alatrowy
+Arol = Arolowy
+Brass = Mosiądzu
+Bronze = Brązu
+Carbon Steel = Stali węglowej
+Cast Iron = Żeliwa
+Chromium = Chromu
+Coal = Węglowy
+Copper = Miedzi
+Gold = Złoty
+Mithril = Mithrilu
+Silver = Srebrny
+Stainless Steel = Stali nierdzewnej
+Talinite = Talinitu
+Tin = Cyny
+Wrought Iron = Kutego żelaza
+Zinc = Cynku
+%.1f%%-Fissile Uranium = %.1f%% Uranu
 
 ## Tools
 RE Battery = Bateria ładowalna
@@ -162,8 +161,8 @@ Flashlight = Latarka
 3x3 nodes. = 3x3 bloki.
 Use while sneaking to change Mining Drill Mk%d modes. = Użyj podczas skradania, aby zmienić tryby wiertła górniczego Mk%d
 Mining Drill Mk%d Mode %d = Tryb wiertła górniczego Mk%d
-Mining Drill Mk%d = Wiertła górniczego Mk%d
-Mining Laser Mk%d = Laser górniczegy Mk%d
+Mining Drill Mk%d = Wiertło górnicze Mk%d
+Mining Laser Mk%d = Laser górniczy Mk%d
 Single node. = Pojedynczy blok.
 Sonic Screwdriver = Dźwiękowy śrubokręt 
 Tree Tap = Nacinak drzewny
diff --git a/technic/machines/HV/forcefield.lua b/technic/machines/HV/forcefield.lua
index 7395284..29c023d 100644
--- a/technic/machines/HV/forcefield.lua
+++ b/technic/machines/HV/forcefield.lua
@@ -121,6 +121,12 @@ local function set_forcefield_formspec(meta)
 end
 
 local forcefield_receive_fields = function(pos, formname, fields, sender)
+	local player_name = sender:get_player_name()
+	if minetest.is_protected(pos, player_name) then
+		minetest.chat_send_player(player_name, "You are not allowed to edit this!")
+		minetest.record_protection_violation(pos, player_name)
+		return
+	end
 	local meta = minetest.get_meta(pos)
 	local range = nil
 	if fields.range then
diff --git a/technic/machines/HV/quarry.lua b/technic/machines/HV/quarry.lua
index 1671c4e..9cf378f 100644
--- a/technic/machines/HV/quarry.lua
+++ b/technic/machines/HV/quarry.lua
@@ -60,6 +60,12 @@ local function set_quarry_demand(meta)
 end
 
 local function quarry_receive_fields(pos, formname, fields, sender)
+	local player_name = sender:get_player_name()
+	if minetest.is_protected(pos, player_name) then
+		minetest.chat_send_player(player_name, "You are not allowed to edit this!")
+		minetest.record_protection_violation(pos, player_name)
+		return
+	end
 	local meta = minetest.get_meta(pos)
 	if fields.size and string.find(fields.size, "^[0-9]+$") then
 		local size = tonumber(fields.size)
diff --git a/teleport_request/init.lua b/teleport_request/init.lua
index cf843b0..f51c555 100644
--- a/teleport_request/init.lua
+++ b/teleport_request/init.lua
@@ -10,6 +10,11 @@ local version = "1.5"
 local tpr_list = {}

 local tphr_list = {}

 

+local map_size = 30912

+local function can_teleport(to)

+   return to.x < map_size and to.x > -map_size and to.y < map_size and to.y > -map_size and to.z < map_size and to.z > -map_size

+end

+

 minetest.register_privilege("tp_admin", {

 	description = "Admin overrides for tps_teleport.",

 	give_to_singleplayer=false

@@ -121,14 +126,14 @@ local function tpc_send(player,coordinates)
 		minetest.chat_send_player(player, "Usage: /tpc <x,y,z>")

 		return nil

 	end

-	

-	if posx > 32765 or posx < -32765 or posy > 32765 or posy < -32765 or posz > 32765 or posz < -32765 then

-		minetest.chat_send_player(player, "Error: Invalid coordinates.")

-		return nil

-	end

 

 	local target_coords={x=posx, y=posy, z=posz}

 

+	if can_teleport(target_coords) == false then

+		minetest.chat_send_player("You cannot teleport to a location outside the map!")

+		return nil

+	end

+

 	-- If the area is protected, reject the user's request to teleport to these coordinates

 	-- In future release we'll actually query the player who owns the area, if they're online, and ask for their permission.

 	-- Admin user (priv "tp_admin") overrides all protection

@@ -235,22 +240,21 @@ local function tpj(player,param)
 	local target_coords = minetest.get_player_by_name(player):getpos()

 	if args[1] == "x" then

 		target_coords["x"] = target_coords["x"] + tonumber(args[2])

-		pname:setpos(find_free_position_near(target_coords))

-		minetest.sound_play("whoosh", {pos = target_coords, gain = 0.5, max_hear_distance = 10})

-		--parti2(target_coords)

 	elseif args[1] == "y" then

 		target_coords["y"] = target_coords["y"] + tonumber(args[2])

-		pname:setpos(find_free_position_near(target_coords))

-		minetest.sound_play("whoosh", {pos = target_coords, gain = 0.5, max_hear_distance = 10})

-		--parti2(target_coords)

 	elseif args[1] == "z" then

 		target_coords["z"] = target_coords["z"] + tonumber(args[2])

-		pname:setpos(find_free_position_near(target_coords))

-		minetest.sound_play("whoosh", {pos = target_coords, gain = 0.5, max_hear_distance = 10})

-		--parti2(target_coords)

 	else

 		minetest.chat_send_player(player,"Not a valid axis. Valid options are X, Y or Z.")

+		return

+	end

+	if can_teleport(target_coords) == false then

+		minetest.chat_send_player(player, "You cannot teleport to a location outside the map!")

+		return

 	end

+	pname:setpos(find_free_position_near(target_coords))

+	minetest.sound_play("whoosh", {pos = target_coords, gain = 0.5, max_hear_distance = 10})

+	--parti2(target_coords)

 end

 

 -- Evade

diff --git a/worldedit/manipulations.lua b/worldedit/manipulations.lua
index ee51561..a6aad16 100644
--- a/worldedit/manipulations.lua
+++ b/worldedit/manipulations.lua
@@ -529,20 +529,22 @@ end
 -- @param pos2

 -- @param angle Angle in degrees (90 degree increments only).

 -- @return The number of nodes oriented.

--- TODO: Support 6D facedir rotation along arbitrary axis.

 function worldedit.orient(pos1, pos2, angle)

 	local pos1, pos2 = worldedit.sort_pos(pos1, pos2)

 	local registered_nodes = minetest.registered_nodes

 

 	local wallmounted = {

-		[90]  = {[0]=0, 1, 5, 4, 2, 3},

-		[180] = {[0]=0, 1, 3, 2, 5, 4},

-		[270] = {[0]=0, 1, 4, 5, 3, 2}

+		[90]  = {0, 1, 5, 4, 2, 3, 0, 0},

+		[180] = {0, 1, 3, 2, 5, 4, 0, 0},

+		[270] = {0, 1, 4, 5, 3, 2, 0, 0}

 	}

 	local facedir = {

-		[90]  = {[0]=1, 2, 3, 0},

-		[180] = {[0]=2, 3, 0, 1},

-		[270] = {[0]=3, 0, 1, 2}

+		[90]  = { 1,  2,  3,  0, 13, 14, 15, 12, 17, 18, 19, 16,

+				  9, 10, 11,  8,  5,  6,  7,  4, 23, 20, 21, 22},

+		[180] = { 2,  3,  0,  1, 10, 11,  8,  9,  6,  7,  4,  5,

+				 18, 19, 16, 17, 14, 15, 12, 13, 22, 23, 20, 21},

+		[270] = { 3,  0,  1,  2, 19, 16, 17, 18, 15, 12, 13, 14,

+				  7,  4,  5,  6, 11,  8,  9, 10, 21, 22, 23, 20}

 	}

 

 	angle = angle % 360

@@ -558,8 +560,7 @@ function worldedit.orient(pos1, pos2, angle)
 	worldedit.keep_loaded(pos1, pos2)

 

 	local count = 0

-	local set_node, get_node, get_meta, swap_node = minetest.set_node,

-			minetest.get_node, minetest.get_meta, minetest.swap_node

+	local get_node, swap_node = minetest.get_node, minetest.swap_node

 	local pos = {x=pos1.x, y=0, z=0}

 	while pos.x <= pos2.x do

 		pos.y = pos1.y

@@ -569,17 +570,20 @@ function worldedit.orient(pos1, pos2, angle)
 				local node = get_node(pos)

 				local def = registered_nodes[node.name]

 				if def then

-					if def.paramtype2 == "wallmounted" then

-						node.param2 = wallmounted_substitution[node.param2]

-						local meta = get_meta(pos):to_table()

-						set_node(pos, node)

-						get_meta(pos):from_table(meta)

+					local paramtype2 = def.paramtype2

+					if paramtype2 == "wallmounted" or

+							paramtype2 == "colorwallmounted" then

+						local orient = node.param2 % 8

+						node.param2 = node.param2 - orient +

+								wallmounted_substitution[orient + 1]

+						swap_node(pos, node)

 						count = count + 1

-					elseif def.paramtype2 == "facedir" then

-						node.param2 = facedir_substitution[node.param2]

-						local meta = get_meta(pos):to_table()

-						set_node(pos, node)

-						get_meta(pos):from_table(meta)

+					elseif paramtype2 == "facedir" or

+							paramtype2 == "colorfacedir" then

+						local orient = node.param2 % 32

+						node.param2 = node.param2 - orient +

+								facedir_substitution[orient + 1]

+						swap_node(pos, node)

 						count = count + 1

 					end

 				end

diff --git a/worldedit/serialization.lua b/worldedit/serialization.lua
index a0848e2..4aef556 100644
--- a/worldedit/serialization.lua
+++ b/worldedit/serialization.lua
@@ -56,10 +56,19 @@ function worldedit.serialize(pos1, pos2)
 

 	worldedit.keep_loaded(pos1, pos2)

 

+	local get_node, get_meta, hash_node_position =

+		minetest.get_node, minetest.get_meta, minetest.hash_node_position

+

+	-- Find the positions which have metadata

+	local has_meta = {}

+	local meta_positions = minetest.find_nodes_with_meta(pos1, pos2)

+	for i = 1, #meta_positions do

+		has_meta[hash_node_position(meta_positions[i])] = true

+	end

+

 	local pos = {x=pos1.x, y=0, z=0}

 	local count = 0

 	local result = {}

-	local get_node, get_meta = minetest.get_node, minetest.get_meta

 	while pos.x <= pos2.x do

 		pos.y = pos1.y

 		while pos.y <= pos2.y do

@@ -68,20 +77,19 @@ function worldedit.serialize(pos1, pos2)
 				local node = get_node(pos)

 				if node.name ~= "air" and node.name ~= "ignore" then

 					count = count + 1

-					local meta = get_meta(pos):to_table()

-

-					local meta_empty = true

-					-- Convert metadata item stacks to item strings

-					for name, inventory in pairs(meta.inventory) do

-						for index, stack in ipairs(inventory) do

-							meta_empty = false

-							inventory[index] = stack.to_string and stack:to_string() or stack

-						end

-					end

-					for k in pairs(meta) do

-						if k ~= "inventory" then

-							meta_empty = false

-							break

+

+					local meta

+					if has_meta[hash_node_position(pos)] then

+						meta = get_meta(pos):to_table()

+

+						-- Convert metadata item stacks to item strings

+						for _, invlist in pairs(meta.inventory) do

+							for index = 1, #invlist do

+								local itemstack = invlist[index]

+								if itemstack.to_string then

+									invlist[index] = itemstack:to_string()

+								end

+							end

 						end

 					end

 

@@ -92,7 +100,7 @@ function worldedit.serialize(pos1, pos2)
 						name = node.name,

 						param1 = node.param1 ~= 0 and node.param1 or nil,

 						param2 = node.param2 ~= 0 and node.param2 or nil,

-						meta = not meta_empty and meta or nil,

+						meta = meta,

 					}

 				end

 				pos.z = pos.z + 1