From 4dee35893a191589c57e9caa4129d1dc98c4ddb5 Mon Sep 17 00:00:00 2001
From: kilbith <jeanpatrick.guerrero@gmail.com>
Date: Wed, 29 Apr 2015 14:14:36 +0200
Subject: [PATCH] Cleaning and tweaking node params

---
 building_blocks/init.lua                      |   7 +-
 chains/init.lua                               |   2 -
 computer/init.lua                             |   3 -
 fake_fire/modfiles/abms.lua                   |  40 +-
 fake_fire/textures/chimney_top_sandstone.xcf  | Bin 2004 -> 0 bytes
 fake_fire/textures/chimney_top_stone.xcf      | Bin 1489 -> 0 bytes
 fake_fire/textures/embers_animated.xcf        | Bin 16716 -> 0 bytes
 fake_fire/textures/fake_fire_animated_old.png | Bin 4686 -> 0 bytes
 fake_fire/textures/fake_fire_embers.xcf       | Bin 1399 -> 0 bytes
 fake_fire/textures/ice_fire.xcf               | Bin 1550 -> 0 bytes
 fake_fire/textures/ice_fire_animated.xcf      | Bin 6110 -> 0 bytes
 homedecor/bathroom_furniture.lua              |   2 +-
 homedecor/bathroom_sanitation.lua             |  14 +-
 homedecor/beds.lua                            | 139 +++++
 homedecor/books.lua                           |  14 +-
 homedecor/climate-control.lua                 |   9 +-
 homedecor/clocks.lua                          |  20 +-
 homedecor/doors_and_gates.lua                 |   8 +-
 homedecor/electronics.lua                     |  13 +-
 homedecor/exterior.lua                        |  25 +-
 homedecor/furniture.lua                       | 555 +++++++-----------
 homedecor/furniture_medieval.lua              |  19 +-
 homedecor/init.lua                            |   2 +-
 homedecor/kitchen_appliances.lua              |  38 +-
 homedecor/kitchen_furniture.lua               |  10 +-
 homedecor/laundry.lua                         |   3 -
 homedecor/lighting.lua                        |  39 +-
 homedecor/misc-electrical.lua                 |   6 +-
 homedecor/misc-nodes.lua                      |  98 ++--
 homedecor/nightstands.lua                     |   2 -
 homedecor/paintings.lua                       |  26 -
 homedecor/shingles.lua                        |  10 +-
 homedecor/shutters.lua                        |   1 -
 homedecor/slopes.lua                          |  13 -
 homedecor/tables.lua                          |   8 +-
 homedecor/window_treatments.lua               |   6 +-
 inbox/init.lua                                |   7 -
 lavalamp/init.lua                             |   5 +-
 lrfurn/init.lua                               |   2 -
 plasmascreen/init.lua                         |   3 -
 40 files changed, 516 insertions(+), 633 deletions(-)
 delete mode 100644 fake_fire/textures/chimney_top_sandstone.xcf
 delete mode 100644 fake_fire/textures/chimney_top_stone.xcf
 delete mode 100644 fake_fire/textures/embers_animated.xcf
 delete mode 100644 fake_fire/textures/fake_fire_animated_old.png
 delete mode 100644 fake_fire/textures/fake_fire_embers.xcf
 delete mode 100644 fake_fire/textures/ice_fire.xcf
 delete mode 100644 fake_fire/textures/ice_fire_animated.xcf
 create mode 100644 homedecor/beds.lua
 delete mode 100644 homedecor/paintings.lua

diff --git a/building_blocks/init.lua b/building_blocks/init.lua
index ea14a658..e06b8372 100644
--- a/building_blocks/init.lua
+++ b/building_blocks/init.lua
@@ -151,7 +151,6 @@ minetest.register_node("building_blocks:grate", {
 	sunlight_propagates = true,
 	is_ground_content = true,
 	groups = {cracky=1},
-	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("building_blocks:Fireplace", {
@@ -212,6 +211,7 @@ minetest.register_node("building_blocks:Tarmac_spread", {
 	sunlight_propagates = true,
 	is_ground_content = true,
 	groups = {cracky=3},
+	sounds = default.node_sound_dirt_defaults(),
 })
 minetest.register_node("building_blocks:BWtile", {
 	drawtype = "raillike",
@@ -260,6 +260,10 @@ minetest.register_node("building_blocks:gravel_spread", {
 	sunlight_propagates = true,
 	is_ground_content = true,
 	groups = {crumbly=2},
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_gravel_footstep", gain=0.5},
+		dug = {name="default_gravel_footstep", gain=1.0},
+	}),
 })
 minetest.register_node("building_blocks:hardwood", {
 	tiles = {"building_blocks_hardwood.png"},
@@ -593,4 +597,3 @@ if not minetest.get_modpath("technic") then
 		})
 	end
 end
-
diff --git a/chains/init.lua b/chains/init.lua
index 102d0d2b..2facad04 100644
--- a/chains/init.lua
+++ b/chains/init.lua
@@ -1,5 +1,3 @@
-print("[Chains] v1.3")
-
 local chains_sbox = {
 	type = "fixed",
 	fixed = { -0.1, -0.625, -0.1, 0.1, 0.5, 0.1 }
diff --git a/computer/init.lua b/computer/init.lua
index a0c7a0fe..58b2589c 100644
--- a/computer/init.lua
+++ b/computer/init.lua
@@ -1,4 +1,3 @@
-
 computer = { };
 
 computer.register = function ( name, def )
@@ -99,5 +98,3 @@ local MODPATH = minetest.get_modpath("computer");
 dofile(MODPATH.."/computers.lua");
 dofile(MODPATH.."/miscitems.lua");
 dofile(MODPATH.."/recipes.lua");
-
-
diff --git a/fake_fire/modfiles/abms.lua b/fake_fire/modfiles/abms.lua
index 4a7cc6f4..6067e7e3 100644
--- a/fake_fire/modfiles/abms.lua
+++ b/fake_fire/modfiles/abms.lua
@@ -1,32 +1,26 @@
 minetest.register_abm({
 	nodenames = {
-				"fake_fire:fake_fire",
-				"fake_fire:ice_fire",
-				"fake_fire:chimney_top_stone",
-				"fake_fire:chimney_top_sandstone"
-				},
+		"fake_fire:fake_fire",
+		"fake_fire:ice_fire",
+		"fake_fire:chimney_top_stone",
+		"fake_fire:chimney_top_sandstone"
+	},
 	interval = 1,
 	chance = 2,
 	action = function(pos, node)
 		if minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z}).name == "air"
-			and minetest.get_node({x=pos.x, y=pos.y+2.0, z=pos.z}).name == "air" then
-		local image_number = math.random(4)
-		minetest.add_particlespawner({
-			amount = 6,
-			time = 1,
-			minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25},
-			maxpos = {x=pos.x+0.25, y=pos.y+8, z=pos.z+0.25},
-			minvel = {x=-0.2, y=0.3, z=-0.2},
-			maxvel = {x=0.2, y=1, z=0.2},
-			minacc = {x=0,y=0,z=0},
-			maxacc = {x=0,y=0,z=0},
-			minexptime = 0.5,
-			maxexptime = 3,
-			minsize = 2,
-			maxsize = 10,
-			collisiondetection = false,
-			texture = "smoke_particle_"..image_number..".png",
-		})
+		  and minetest.get_node({x=pos.x, y=pos.y+2.0, z=pos.z}).name == "air" then
+			local image_number = math.random(4)
+			minetest.add_particlespawner({
+				amount = 6, time = 1, collisiondetection = false,
+				minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25},
+				maxpos = {x=pos.x+0.25, y=pos.y+8, z=pos.z+0.25},
+				minvel = {x=-0.2, y=0.3, z=-0.2}, maxvel = {x=0.2, y=1, z=0.2},
+				minacc = {x=0,y=0,z=0}, maxacc = {x=0,y=0,z=0},
+				minexptime = 0.5, maxexptime = 3,
+				minsize = 2, maxsize = 10,
+				texture = "smoke_particle_"..image_number..".png",
+			})
 		end
 	end
 })
diff --git a/fake_fire/textures/chimney_top_sandstone.xcf b/fake_fire/textures/chimney_top_sandstone.xcf
deleted file mode 100644
index 2edfc4736da5b318fd7c6efef057cf2f364cb84c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2004
zcmd5)+jA0E7$-5MYTKz!Z67*)V06aOhd9wu+r0Wm^sx>m1h*3|0*OG7kSib%z+4H0
zC0UZN0Tz~B*l=IMa!D{$sX8Y5($4tWKLLAA0-bbfr!PMA+xgD<o!@sm`<+jWNaO-_
z-+*8M85Hq=oNFn>=Ye)~faNQor|&qrJWv6?0JIBoK)-2W==U}7zXSGjVvx2QkqE`2
zZm|OC2NVz3J9t-=D$Srspp*?F{a4Rk84&l$24xDtm7}d&A-*RR^jzyXk`I9EEz?yH
zdhY|FZM)##0Sr|u<-$HhDi&OC*8-&GLu8BV9+Dy|0V3_YFH*vI*}#BOr26ZEF#4a=
zG4uCO*ayB?D3J(T9pPQ*xpwmw_<DPLf9Sb+v-kG*w{JmPOFF_l-l=!(6WH6&1G{}%
zCKpM;e?W65T!8R_!k2ju6uu6`(DzIWgN^sy34Hbh{_F()`~?2u1pX3Wn71vT0sw13
zX-~ze<0D)<k7f#h_Pv2`r>13Zah+y(zQJoc>il{$0n#=7m-&~Q^^b>Ke!jnH=3R$X
z3@o2*24HT-CH|!*`|;4UgYRgnkE{IT<NKN>m>apszu5GBJS0T;Nb|>|Dreq*!uxN%
z0o&W|Kg8em-A5!+k>;*SCcmo`O8b>6nN)O5emqJ4hY4y=Gq`NmCcH9`_8)-h>PjC|
zZLX^Z&xQ`(tDV<>P_=TUS_#EVFG7jNP9t(qtL@Ue1>)r)OT0)V@Yiwnccz-Gq`B$}
zMZe%;RJN3UyB~kL!aidX2SqYPRo^!1H9Vi-%Kln`Es*7>htE=JoGT?8RQ8~}nMzh0
z`|skxWNssbvve_#3s+;w(tf^FD?TNIbiGpK(A^!1%qRBP@ZQU4^*LFN()rwWAykP+
z3w!(27Jj%+6=*!%C~{mXlO*z~S~#_v%M#ff_9{b%in~d6lPlJqy~$8)zD!bhCRxta
zekm21e4@UWA+o>i1uF-Y0vRfijW=m7`J9e}7VHqELo^kSGYPk!-f^$9M9x!ArWkBH
z>fx#p4~t>*oImn>g9*fODq%&}c4FSu5RKQ;{`BKW-j9`|UVM$Iv6<u&;iqWFHW7;W
z;^}HGu(d?dn=BeE(F=HhDP(@dT$@{SON(JFx)63Vs~c3Bh$UkwuiKwVP_%uU^r4}3
zhH$4ibi3e7pcoNakGSF(N^WPdW!LVLwdmTSCr{GURtR4q@RTRO1h+iFpo7CPSBwb|
z^CWPs;;TfM^7<C=4Jw$*($V#hKh5BtV4ZQ%6*_`0$56H!AUAWX7-)gp=%v(8Y%`7-
zrOvvn)Vqv}L#T7sKH@Z~JU*k!rPE1QbVgk7FxbW{Ga~hf+oIM?TF0<i-CUn>@sSQS
zKOEQEG1r_^KCQFb5T|j<sJ6}e77XKZi`C%LOnR--F@xPT7aVyoIw5%=pB^zwr<60A
zQOoSK*<p4L$<$7Z$<%K*sUJ@2>{CkXlFB+i^mtf1HTh`jflaHJusPLI$?DG<qgJL|
zFq@|J2EAg!;8Yl9CdO0~qoU<ewahp(IyGoEJLb_xs>yM)YFIL+w@f(aEhg=l)@d76
XjBnWGR@7=7mKulVy?Ud5L8JW>`Ssrt

diff --git a/fake_fire/textures/chimney_top_stone.xcf b/fake_fire/textures/chimney_top_stone.xcf
deleted file mode 100644
index aab3449cbfafadbd3d57e9624a19c0aa6a0c77fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1489
zcma)*OK;mo5XZ$;#OB#J$m7%lkpO{naFFC9<XGE@W3EKQ;_h;nreuoChb<+s5g-QI
zLoY25K!SSdy`QPqTyty#L9oDNhT;Ye;sP09$RGbRv$GFwKTZqhDC{}CSVs-8mD-VS
zfLj(kZh~KY`tHJC=)kwYFMwYHzf&{j-G=<1;Jwm^Vb|hR_M^4_VY~-Y1L9U=bvQcK
zku%J7y!YVpYOf#WIzMz)tJm6LUrFcD!$*~!1CQ&_11MGJl$yBn|A3`O!$O8})^{G8
zULYQyC)V29%Pbx_aTe}JL#)qxy<s%^GC{2VR$3}wm*PIuX8pE=7VaCG*?9cE6Yj@p
z79ERGUWnl+&!UG#*2gS@4=@`XPv8^y#hS4aPXu)|JPE^>&+wHqeDw@pJHyw3aa?0R
z0GP4N>6^Jgh-}u0W)+Z2<kuQG!0)+KVW<LOiT6~9AdoUIRI#54k)~M|<azP@x#x8-
z;lC`Gvg3KrI_j6HJw1Kb@wPn6D~tQ~{c<WTNmRwNX^_j%^H85n+iiIOBUYSArDU+=
zTo%%B$J+^l_EJ{|du`}i<tuMTN_AA&#e4*ng@SfO5zl%vFLJ4h0-Bb&YO1mWwAkA5
zB#{;*EILwpA33Z?Fu&V<;S>J@<2n`TUefKxgF(WyPB%8FMQ0HAlZ12N({(CNCidj?
z4@xmsruXc7<%C<Dh>B+umaw2rQJ+m*muE0!#R(UJGs7u2Olg}jcd3gsaG`CLFKC-{
z@iMj3`2kd>0@@Kl=)Xs=wPvvSf^#jJqNLD$@r+VVxFwp@;tl$dVKcwGySvpT-G6+R
zXs*M-?(TjZ4`3~NeVtMl!rj3Dnp66-%ioUe@#*ibyN=7!ckR37m|2YQif3bg;0sDo
zpN+S-SqcMIJYcXA->_zeVNl=SUg|K<ZD?BMb4nTGBW>$>0hJnem2g<r>sLwQbFC|}
z$x9cyFE$~YFxXwXaABe+R&{^OKYQJcbQF%_JaabXFu}jo{PO0yoq+Z|*X_r;7Ox}@
l-vkFUHwWd~TE7CA8GzpUvkuf+>u>yi(zx`g^&S4C@fpznZ14a8

diff --git a/fake_fire/textures/embers_animated.xcf b/fake_fire/textures/embers_animated.xcf
deleted file mode 100644
index 23e7da2a8a1f28e6fcd26005da868fcb1c8d61c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16716
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

diff --git a/fake_fire/textures/fake_fire_animated_old.png b/fake_fire/textures/fake_fire_animated_old.png
deleted file mode 100644
index 328e2855a60b2514d5fa00b4843d43f07989a481..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4686
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
LMq1Sx4w3%@F&l#N

diff --git a/fake_fire/textures/fake_fire_embers.xcf b/fake_fire/textures/fake_fire_embers.xcf
deleted file mode 100644
index e3ca954558ba6a311efe866a82ca946c8d21eaec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1399
zcmZ`$%TC)+5Y60SZft{jsD)Tcz}{4XMWV1}*;V&h;6)|G!%3}%hY~8`b-$;ZenEfW
zuDa+SRDjw_l~5&6p*`c;6{z$obMKkgnd8YQKRij!_J_$ZA7>4m#mW>f!H94@fqBnA
z*k@|MPhm5#W!OrEwGKXY@Gg!(+szMmM_G3?$qx`}AWx0;>1i>}lIig{KiCM?hok-D
z@$n>CFQ4vYw6~k|d;Rh}0yeAE23q$XX|40g|ADriO;2|B^P^F+S<gbScq~}Ox^Is1
z(<DFIf0a$O|9Ci@W~YAzYWKgPKaq#6x`*n}+Zy4$zx3td?(1x4m`}2u>~JreOnWCs
zBds-6gT<@M{{{0ZtjqT+jHjW0g4XB>U^Sk-hv)9$@E%?OR^IwF0qXwxkFT{LWnNT;
z^+zybFCWItSpD~Y%&r+*C(fo$nnBE|G-HpqS=ezBc+Ac=V`1^w21$TAVdPQ{QWqqN
zNtxTTUDuYN?}UWhyVQ#7cF@u3+W}bMN=H236VLVro&|x@#lE)|h{T=_PwiUZi>%>i
zQ<k=qIOsX?WZ-F@<;o3u&QG1c;#-WlSn~oWAWaz&8Teit2r@=KrQ%E4ZZ>_{c982*
z$J>LpbUW<C>PJG7Sm~nnc17%GYEeNgQ&3@|g2=QeBKQasT@@4=Lr9hG4@1U8MqQ@M
zh|pl7sDb(gS}hjH%z*&a*IKh`0Wa;G*(&=BvV?XJ%x>YHp|6;vWSFJHqY~2>kO6{G
zMa>rI(DJ(i6R(OD1R!!AQKAb-Q^Bfto@fiw5!M-Zh|p~WL3GiA*rGsFYYQSRz7?OK
zGH;Z76?O}{bBGDiAL7Pk7}`ocrt^>@1~C#?3ASN4VtAl9*I{fz#uDKBW-0X5M@q|o
zhD%yy%=cJ*0xz<x%y%)a8TyEk%BDLgN0*bz6)0awEoEbhS@YNcC{!TN>%XEKU<^Z&
l5TO{d!LFjN^)kNR^eu$kP*ue~L6OQZcPjEm;Sx+&@Eh+z!nyze

diff --git a/fake_fire/textures/ice_fire.xcf b/fake_fire/textures/ice_fire.xcf
deleted file mode 100644
index 62ce3f5e8d14725dd534d5d48799342e8b14f6ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1550
zcmd5*ZA?>F7=CUkQa+WbKy}d@H4LIHg@M4F(O{g>Kr}kd5;m6F_TJuvQqp3g5}488
zk1Zi4WKo0hkI`Ji3>w8m1!L4rr}7~nTR}Svu+hR`u*?LNUf%<^qs`cV-`n>+Pv5U|
zp7S9}j&lB>Mc@Ug)CQ78sxq8N%5h{Clj;giXwNVuyo6Lssv%8MG0R&@`2{pC5~;00
za+pP%L3Bx0a)II;(%cn?N^QK`St?o6W6}iC;w*K#__Ue9;1c(nd6UsJBlCbvHIz=J
z`{yYQ#`*sTtn{F}+-#A`L_RY(7da2j=Tv=$17%VLFO^yBHaDwx3WD2K@$Ujz^?zNn
zp72t(4+})I!(mo;1WQcD>>T>?^Yime+1dH)bJypvm@3@GAfhpNG;F8iC5!EAL2}uQ
z<z*tvVMoDa0Vz8gg;b|vRuHXX8t`EVjtRlBAvi7s$A{pBgjwI9L=j-~F$ujEvmR&!
z6$BSgxthb_KFzo6zYbhw1Oh3<B#=lgryF^?Fo7g8ll(`(ryne?)_=1MdUCu;Nn5s*
z68)#;l}JrOGQTGkO{)yJ{0J~o;Amdf+SJVM`y-PZwh3D|X8@ak^gI)GuG^i3U8XOP
zj-reW#W?WQajFm+GdAL|J?A{CPSS!iD{JI^XOHc0v|P^ktp?b#Np{F+sjNNU@bK>U
zTY(~ZFK|jeRZ>5Eu5p(QpHLHLgJ3xMXyZz`;Q_7CTU>SX$4X;uP3O9T7UAk$`=#FF
zO-)W$?HYY@sw~u1)lt&4J_QkscoGq}Fyfyv;;WBPEKp2l@(8`Q#O;N8>v9Qpa=bC0
zlRjs}`8Cz3FUFV0x=&;6ch|7`W8elO-um+o^$!bj_m;Fh^>nm11MR?t)_dr>()Ac!
zcb-8;XLDN*p7*>2Zh1y-x8a57$uPV_9^fZ$zwg-}{ZD(xMw(ys10C(YULVH11H=A_
z@xczD)7K3Q`G$V^eQJ25>sPc=lRm%a`p`sMwa-66EA;kw|NP5)YoPz{EA3;R(Q%Le
zpO>SfeSHIU){=UkXV5!HNz-=oEb)Xe;<|9+y6uHg*4S|3T>R)9@dP5CNSASr_`<lX
z74JXs1Oyaz+6p3>p~Gf|Q#7Pg^m5t9Awr47Yl8ICC@id<Ez>Fyh$P2bdg2PF1X!31
kr@Uo_D(0XKiExOgf*DT~0oE>BdCgiwiKc1!nW?pS2PQ!HYXATM

diff --git a/fake_fire/textures/ice_fire_animated.xcf b/fake_fire/textures/ice_fire_animated.xcf
deleted file mode 100644
index b663b8ffdf7b9c8e9e6b44415dc7be75c0756735..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6110
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

diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua
index dd33d569..4676685b 100644
--- a/homedecor/bathroom_furniture.lua
+++ b/homedecor/bathroom_furniture.lua
@@ -44,7 +44,7 @@ homedecor.register("towel_rod", {
 	},
 	inventory_image = "homedecor_towel_rod_inv.png",
 	selection_box = tr_cbox,
-	collision_box = tr_cbox,
+	walkable = false,
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3},
 	sounds = default.node_sound_defaults(),
 })
diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua
index 3b634d13..04096084 100644
--- a/homedecor/bathroom_sanitation.lua
+++ b/homedecor/bathroom_sanitation.lua
@@ -66,7 +66,7 @@ homedecor.register("toilet_paper", {
 	},
 	inventory_image = "homedecor_toilet_paper_inv.png",
 	selection_box = tp_cbox,
-	collision_box = tp_cbox,
+	walkable = false,
 	groups = {snappy=2,oddly_breakable_by_hand=3,flammable=3},
 	sounds = default.node_sound_defaults(),
 })
@@ -112,7 +112,7 @@ homedecor.register("taps", {
 		fixed = { -4/16, -7/16, 4/16, 4/16, -4/16, 8/16 },
 	},
 	walkable = false,
-	groups = {cracky=2,},
+	groups = {cracky=2},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -127,13 +127,12 @@ homedecor.register("taps_brass", {
 	},
 	inventory_image = "3dforniture_taps_brass_inv.png",
 	wield_image = "3dforniture_taps_brass_inv.png",
-	sunlight_propagates = true,
 	selection_box = {
 		type = "fixed",
 		fixed = { -4/16, -7/16, 4/16, 4/16, -4/16, 8/16 },
 	},
 	walkable = false,
-	groups = {cracky=2,},
+	groups = {cracky=2},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -145,8 +144,6 @@ homedecor.register("shower_tray", {
 		"forniture_marble_base_ducha_top.png",
 		"forniture_marble.png"
 	},
-	sunlight_propagates = true,
-	legacy_facedir_simple = true,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -209,7 +206,7 @@ homedecor.register("shower_head", {
 	description = "Shower Head",
 	groups = {snappy=3},
 	selection_box = sh_cbox,
-	collision_box = sh_cbox,
+	walkable = false,
 	on_rightclick = function (pos, node, clicker)
 		local below = minetest.get_node({x=pos.x, y=pos.y-2.0, z=pos.z})
 		local is_tray = string.find(below.name, "homedecor:shower_tray")
@@ -296,7 +293,8 @@ homedecor.register("bathroom_set", {
 	description = "Bathroom sundries set",
 	groups = {snappy=3},
 	selection_box = bs_cbox,
-	collision_box = bs_cbox,
+	walkable = false,
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_alias("3dforniture:toilet", "homedecor:toilet")
diff --git a/homedecor/beds.lua b/homedecor/beds.lua
new file mode 100644
index 00000000..2f1ca9de
--- /dev/null
+++ b/homedecor/beds.lua
@@ -0,0 +1,139 @@
+local S = homedecor.gettext
+
+local bedcolors = {
+	"red",
+	"green",
+	"blue",
+	"violet",
+	"brown",
+	"darkgrey",
+	"orange",
+	"yellow",
+	"pink",
+}
+
+local bed_sbox = {
+	type = "fixed",
+	fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 }
+}
+
+local bed_cbox = {
+	type = "fixed",
+	fixed = { 
+		{ -0.5, -0.5, -0.5, 0.5, -0.05, 1.5 },
+		{ -0.5, -0.5, 1.44, 0.5, 0.5, 1.5 },
+		{ -0.5, -0.5, -0.5, 0.5, 0.18, -0.44 },
+	}
+}
+
+local kbed_sbox = {
+	type = "fixed",
+	fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 1.5 }
+}
+
+local kbed_cbox = {
+	type = "fixed",
+	fixed = { 
+		{ -0.5, -0.5, -0.5, 1.5, -0.05, 1.5 },
+		{ -0.5, -0.5, 1.44, 1.5, 0.5, 1.5 },
+		{ -0.5, -0.5, -0.5, 1.5, 0.18, -0.44 },
+	}
+}
+
+for _, color in ipairs(bedcolors) do
+	local color2=color
+	if color == "darkgrey" then
+		color2 = "dark_grey"
+	end
+	homedecor.register("bed_"..color.."_regular", {
+		mesh = "homedecor_bed_regular.obj",
+		tiles = {
+			"homedecor_bed_frame.png",
+			"default_wood.png",
+			"wool_white.png",
+			"wool_"..color2..".png",
+			"homedecor_bed_bottom.png",
+			"wool_"..color2..".png^[brighten", -- pillow
+		},
+		inventory_image = "homedecor_bed_"..color.."_inv.png",
+		description = S("Bed (%s)"):format(color),
+		groups = {snappy=3},
+		selection_box = bed_sbox,
+		collision_box = bed_cbox,
+		sounds = default.node_sound_wood_defaults(),
+		after_place_node = function(pos, placer, itemstack, pointed_thing)
+			if not placer:get_player_control().sneak then
+				return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color)
+			end
+		end,
+		after_dig_node = function(pos)
+			homedecor.unextend_bed(pos, color)
+		end,
+		on_rightclick = function(pos, node, clicker)
+			if minetest.get_modpath("beds") then
+				beds.on_rightclick(pos, clicker)
+			else return end
+		end
+	})
+
+	homedecor.register("bed_"..color.."_extended", {
+		mesh = "homedecor_bed_extended.obj",
+		tiles = {
+			"homedecor_bed_frame.png",
+			"default_wood.png",
+			"wool_white.png",
+			"wool_"..color2..".png",
+			"homedecor_bed_bottom.png",
+			"wool_"..color2..".png^[brighten",
+		},
+		groups = {snappy=3, not_in_creative_inventory=1},
+		selection_box = bed_sbox,
+		collision_box = bed_cbox,
+		sounds = default.node_sound_wood_defaults(),
+		expand = { forward = "air" },
+		after_dig_node = function(pos)
+			homedecor.unextend_bed(pos, color)
+		end,
+		on_rightclick = function(pos, node, clicker)
+			if minetest.get_modpath("beds") then
+				beds.on_rightclick(pos, clicker)
+			else return end
+		end,
+		drop = "homedecor:bed_"..color.."_regular"
+	})
+
+	homedecor.register("bed_"..color.."_kingsize", {
+		mesh = "homedecor_bed_kingsize.obj",
+		tiles = {
+			"homedecor_bed_frame.png",
+			"default_wood.png",
+			"wool_white.png",
+			"wool_"..color2..".png",
+			"homedecor_bed_bottom.png",
+			"wool_"..color2..".png^[brighten",
+		},
+		inventory_image = "homedecor_bed_kingsize_"..color.."_inv.png",
+		description = S("Bed (%s, king sized)"):format(color),
+		groups = {snappy=3, not_in_creative_inventory=1},
+		selection_box = kbed_sbox,
+		collision_box = kbed_cbox,
+		sounds = default.node_sound_wood_defaults(),
+		after_dig_node = function(pos, oldnode, oldmetadata, digger)
+			local inv = digger:get_inventory()
+			if digger:get_player_control().sneak and inv:room_for_item("main", "bed_"..color.."_regular 1") then
+				inv:remove_item("main", "homedecor:bed_"..color.."_kingsize 1")
+				inv:add_item("main", "homedecor:bed_"..color.."_regular 2")
+			end
+		end,
+		on_rightclick = function(pos, node, clicker)
+			if minetest.get_modpath("beds") then
+				beds.on_rightclick(pos, clicker)
+			else return end
+		end
+	})
+
+	minetest.register_alias("homedecor:bed_"..color.."_foot",    "homedecor:bed_"..color.."_regular")
+	minetest.register_alias("homedecor:bed_"..color.."_footext", "homedecor:bed_"..color.."_extended")
+	minetest.register_alias("homedecor:bed_"..color.."_head",    "air")
+
+end
diff --git a/homedecor/books.lua b/homedecor/books.lua
index 48e90a06..6b52d27e 100644
--- a/homedecor/books.lua
+++ b/homedecor/books.lua
@@ -36,6 +36,7 @@ homedecor.register("book_"..color, {
 	inventory_image = "homedecor_book_"..color.."_inv.png",
 	wield_image = "homedecor_book_"..color.."_inv.png",
 	groups = { snappy=3, oddly_breakable_by_hand=3, book=1 },
+	walkable = false,
 	stack_max = 1,
 	on_rightclick = function(pos, node, clicker)
 		local fdir = node.param2
@@ -99,11 +100,7 @@ homedecor.register("book_"..color, {
 	selection_box = {
             type = "fixed",
 			fixed = {-0.2, -0.5, -0.25, 0.2, -0.35, 0.25}
-	},
-	collision_box = {
-            type = "fixed",
-			fixed = {-0.15, -0.5, -0.25, 0.15, -0.35, 0.25}
-	},
+	}
 })
 
 homedecor.register("book_open_"..color, {
@@ -111,6 +108,7 @@ homedecor.register("book_open_"..color, {
 	tiles = { "homedecor_book_open_"..color..".png" },
 	groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1 },
 	drop = "homedecor:book_"..color,
+	walkable = false,
 	on_dig = book_dig,
 	on_rightclick = function(pos, node, clicker)
 		local fdir = node.param2
@@ -124,11 +122,7 @@ homedecor.register("book_open_"..color, {
 	selection_box = {
             type = "fixed",
 			fixed = {-0.35, -0.5, -0.25, 0.35, -0.4, 0.25}
-	},
-	collision_box = {
-            type = "fixed",
-			fixed = {-0.35, -0.5, -0.25, 0.35, -0.4, 0.25}
-	},
+	}
 })
 
 end
diff --git a/homedecor/climate-control.lua b/homedecor/climate-control.lua
index 6f480052..111960a4 100644
--- a/homedecor/climate-control.lua
+++ b/homedecor/climate-control.lua
@@ -34,7 +34,6 @@ minetest.register_entity("homedecor:mesh_desk_fan", {
 
 homedecor.register("desk_fan", {
 	description = "Desk Fan",
-	legacy_facedir_simple = true,
 	groups = {oddly_breakable_by_hand=2},
 	node_box = {
 		type = "fixed",
@@ -123,7 +122,7 @@ homedecor.register("ceiling_fan", {
 	},
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-1,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 -- heating devices
@@ -138,9 +137,9 @@ homedecor.register("space_heater", {
 		  'homedecor_heater_front.png'
 	},
 	inventory_image = "homedecor_heater_inv.png",
-	sunlight_propagates = true,
+	walkable = false,
 	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -169,5 +168,5 @@ homedecor.register("radiator", {
 	groups = {snappy=3},
 	selection_box = r_cbox,
 	collision_box = r_cbox,
+	sounds = default.node_sound_wood_defaults(),
 })
-
diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua
index 59406370..b8cfd26e 100644
--- a/homedecor/clocks.lua
+++ b/homedecor/clocks.lua
@@ -1,14 +1,3 @@
-local clock_cbox = {
-	type = "fixed",
-	fixed = {
-		{ -8/32, -3/32, 14/32, 8/32, 3/32, 16/32 },
-		{ -7/32, -5/32, 14/32, 7/32, 5/32, 16/32 },
-		{ -6/32, -6/32, 14/32, 6/32, 6/32, 16/32 },
-		{ -5/32, -7/32, 14/32, 5/32, 7/32, 16/32 },
-		{ -3/32, -8/32, 14/32, 3/32, 8/32, 16/32 }
-	}
-}
-
 local clock_sbox = {
 	type = "fixed",
 	fixed = { -8/32, -8/32, 14/32, 8/32, 8/32, 16/32 }
@@ -31,9 +20,10 @@ for i in ipairs(clock_materials) do
 			"homedecor_analog_clock_back.png"
 		},
 		inventory_image = "homedecor_analog_clock_"..m1.."_inv.png",
-		collision_box = clock_cbox,
+		walkable = false,
 		selection_box = clock_sbox,
 		groups = {snappy=3},
+		sounds = default.node_sound_wood_defaults(),
 	})
 end
 
@@ -54,6 +44,8 @@ homedecor.register("digital_clock", {
 			{-0.28125, -0.25, 0.4375, 0.3125, 0.25, 0.5},
 		}
 	},
+	walkable = false,
+	sounds = default.node_sound_wood_defaults(),
 	groups = {snappy=3},
 })
 
@@ -74,6 +66,8 @@ homedecor.register("alarm_clock", {
 			{ -9/32, -16/32, 7/32, 10/32, -5/32, 16/32 },
 		}
 	},
+	walkable = false,
+	sounds = default.node_sound_wood_defaults(),
 	groups = {snappy=3},
 })
 
@@ -102,5 +96,3 @@ homedecor.register("grandfather_clock", {
 
 minetest.register_alias("homedecor:grandfather_clock_bottom", "homedecor:grandfather_clock")
 minetest.register_alias("homedecor:grandfather_clock_top", "air")
-
-
diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua
index c7102b3e..eb9083cf 100644
--- a/homedecor/doors_and_gates.lua
+++ b/homedecor/doors_and_gates.lua
@@ -505,6 +505,7 @@ minetest.register_node("homedecor:japanese_wall_top", {
 	groups = {snappy=3},
 	selection_box = jp_cbox,
 	collision_box = jp_cbox,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("homedecor:japanese_wall_middle", {
@@ -520,6 +521,7 @@ minetest.register_node("homedecor:japanese_wall_middle", {
 	groups = {snappy=3},
 	selection_box = jp_cbox,
 	collision_box = jp_cbox,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("homedecor:japanese_wall_bottom", {
@@ -535,6 +537,7 @@ minetest.register_node("homedecor:japanese_wall_bottom", {
 	groups = {snappy=3},
 	selection_box = jp_cbox,
 	collision_box = jp_cbox,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("homedecor:tatami_mat", {
@@ -549,7 +552,7 @@ minetest.register_node("homedecor:tatami_mat", {
 	description = "Japanese tatami",
 	drawtype = "nodebox",
 	paramtype = "light",
-        groups = {snappy=3},
+	groups = {snappy=3},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -567,6 +570,7 @@ homedecor.register("door_japanese_closed", {
 	},
 	mesh = "homedecor_door_japanese_closed.obj",
 	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, 0, 0.5, 1.5, 0.0625},
@@ -591,6 +595,7 @@ minetest.register_node("homedecor:door_japanese_open", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = { snappy = 3, not_in_creative_inventory = 1 },
+	sounds = default.node_sound_wood_defaults(),
 	selection_box = {
 		type = "fixed",
 		fixed = {-1.5, -0.5, -0.0625, 0.5, 1.5, 0},
@@ -610,4 +615,3 @@ minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_cl
 
 minetest.register_alias("homedecor:jpn_door_top_open", "air")
 minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open")
-
diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua
index d98ed53e..d7b35b47 100644
--- a/homedecor/electronics.lua
+++ b/homedecor/electronics.lua
@@ -10,7 +10,7 @@ homedecor.register("speaker", {
 		"homedecor_speaker_front.png"
 	},
 	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	on_punch = function(pos, node, puncher, pointed_thing)
 		minetest.set_node(pos, {name = "homedecor:speaker_open", param2 = node.param2})
 	end
@@ -26,7 +26,7 @@ homedecor.register("speaker_open", {
 		"homedecor_generic_metal_black.png"
 	},
 	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	on_punch = function(pos, node, puncher, pointed_thing)
 		minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2})
 	end
@@ -45,9 +45,9 @@ homedecor.register("speaker_small", {
 		"homedecor_speaker_front.png"
 	},
 	selection_box = spk_cbox,
-	collision_box = spk_cbox,
+	walkable = false,
 	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 })
 
 homedecor.register("stereo", {
@@ -59,7 +59,7 @@ homedecor.register("stereo", {
 			'homedecor_stereo_back.png',
 			'homedecor_stereo_front.png'},
 	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 })
 
 homedecor.register("projection_screen", {
@@ -138,7 +138,8 @@ homedecor.register("telephone", {
 	description = "Telephone",
 	groups = {snappy=3},
 	selection_box = tel_cbox,
-	collision_box = tel_cbox,
+	walkable = false,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_abm({
diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua
index 4d7e6040..0b08b853 100644
--- a/homedecor/exterior.lua
+++ b/homedecor/exterior.lua
@@ -1,5 +1,4 @@
 local S = homedecor.gettext
-dofile(homedecor.modpath.."/furniture.lua")
 
 local bbq_cbox = {
 	type = "fixed",
@@ -25,6 +24,7 @@ homedecor.register("barbecue", {
 	light_source = 9,
 	selection_box = bbq_cbox,
 	collision_box = bbq_cbox,
+	sounds = default.node_sound_stone_defaults(),
 	expand = { top="air" },
 })
 
@@ -67,12 +67,7 @@ homedecor.register("bench_large_2", {
 	selection_box = bl2_cbox,
 	collision_box = bl2_cbox,
 	expand = { right="air" },
-	--[[
-	on_rightclick = function(pos, node, clicker)
-		pos.y = pos.y-0 -- player's sit position.
-		homedecor.sit_exec(pos, node, clicker)
-	end,
-	--]]
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_alias("homedecor:bench_large_2_left", "homedecor:bench_large_2")
@@ -121,6 +116,7 @@ homedecor.register("doghouse", {
 	collision_box = homedecor.nodebox.slab_y(1.5),
 	groups = {snappy=3},
 	expand = { top="air" },
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_alias("homedecor:doghouse_roof", "air")
@@ -138,12 +134,7 @@ homedecor.register("simple_bench", {
 			{ 0.3, -0.5,  0.1,  0.4, -0.15, 0.3},
 			}
 	},
-	--[[
-	on_rightclick = function(pos, node, clicker)
-		pos.y = pos.y-0 -- player's sit position.
-		homedecor.sit_exec(pos, node, clicker)
-	end,
-	--]]
+	sounds = default.node_sound_wood_defaults(),
 })
 
 homedecor.register("stonepath", {
@@ -169,7 +160,8 @@ homedecor.register("stonepath", {
 	selection_box = {
 		type = "fixed",
 		fixed = { -0.4375, -0.5, -0.4375, 0.4375, -0.4, 0.4375 }
-	}
+	},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 homedecor.register("swing", {
@@ -181,6 +173,8 @@ homedecor.register("swing", {
 	},
 	inventory_image = "homedecor_swing_inv.png",
 	groups = { snappy=3, oddly_breakable_by_hand=3 },
+	sounds = default.node_sound_wood_defaults(),
+	walkable = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -249,6 +243,7 @@ homedecor.register("swing_rope", {
 		"homedecor_swingrope_sides.png"
 	},
 	groups = { not_in_creative_inventory=1 },
+	walkable = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -275,8 +270,8 @@ homedecor.register("well", {
 	selection_box = homedecor.nodebox.slab_y(2),
 	collision_box = homedecor.nodebox.slab_y(2),
 	expand = { top="air" },
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_alias("homedecor:well_top", "air")
 minetest.register_alias("homedecor:well_base", "homedecor:well")
-
diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua
index 0a07cbac..fe06ba67 100644
--- a/homedecor/furniture.lua
+++ b/homedecor/furniture.lua
@@ -1,5 +1,209 @@
 local S = homedecor.gettext
 
+local table_colors = { "", "mahogany", "white" }
+
+for _, i in ipairs(table_colors) do
+	local color = "_"..i
+	local color2 = "_"..i
+	local desc = S("Table ("..i..")")
+
+	if i == "" then
+		color = ""
+		color2 = "_beech"
+		desc = S("Table")
+	end
+
+	homedecor.register("table"..color, {
+		description = desc,
+		tiles = { "homedecor_generic_wood"..color2..".png" },
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{ -0.4, -0.5, -0.4, -0.3,  0.4, -0.3 },
+				{  0.3, -0.5, -0.4,  0.4,  0.4, -0.3 },
+				{ -0.4, -0.5,  0.3, -0.3,  0.4,  0.4 },
+				{  0.3, -0.5,  0.3,  0.4,  0.4,  0.4 },
+				{ -0.5,  0.4, -0.5,  0.5,  0.5,  0.5 },
+				{ -0.4, -0.2, -0.3, -0.3, -0.1,  0.3 },
+				{  0.3, -0.2, -0.4,  0.4, -0.1,  0.3 },
+				{ -0.3, -0.2, -0.4,  0.4, -0.1, -0.3 },
+				{ -0.3, -0.2,  0.3,  0.3, -0.1,  0.4 },
+			},
+		},
+		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+		sounds = default.node_sound_wood_defaults(),
+	})
+end
+
+local chaircolors = {
+	{ "", "plain" },
+	{ "black", "Black" },
+	{ "red", "Red" },
+	{ "pink", "Pink" },
+	{ "violet", "Violet" },
+	{ "blue", "Blue" },
+	{ "dark_green", "Dark Green" },
+}
+
+local kc_cbox = {
+	type = "fixed",
+	fixed = { -0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125 },
+}
+
+for i in ipairs(chaircolors) do
+
+	local color = "_"..chaircolors[i][1]
+	local color2 = chaircolors[i][1]
+	local name = S(chaircolors[i][2])
+	local chairtiles = {
+		"homedecor_generic_wood_beech.png",
+		"wool"..color..".png",
+	}
+
+	if chaircolors[i][1] == "" then
+		color = ""
+		chairtiles = {
+			"homedecor_generic_wood_beech.png",
+			"homedecor_generic_wood_beech.png"
+		}
+	end
+
+	homedecor.register("chair"..color, {
+		description = S("Kitchen chair (%s)"):format(name),
+		mesh = "homedecor_kitchen_chair.obj",
+		tiles = chairtiles,
+		selection_box = kc_cbox,
+		collision_box = kc_cbox,
+		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+		sounds = default.node_sound_wood_defaults(),
+		--[[
+		on_rightclick = function(pos, node, clicker)
+			pos.y = pos.y-0 -- player's sit position.
+			homedecor.sit_exec(pos, node, clicker)
+		end,
+		--]]
+	})
+
+	if color ~= "" then
+		homedecor.register("armchair"..color, {
+			description = S("Armchair (%s)"):format(name),
+			mesh = "forniture_armchair.obj",
+			tiles = {
+				"wool"..color..".png",
+				"wool_dark_grey.png",
+				"default_wood.png"
+			},
+			groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+			sounds = default.node_sound_wood_defaults(),
+		})
+
+		minetest.register_craft({
+			output = "homedecor:armchair"..color.." 2",
+			recipe = {
+			{ "wool:"..color2,""},
+			{ "group:wood","group:wood" },
+			{ "wool:"..color2,"wool:"..color2 },
+			},
+		})
+	end
+end
+
+local ob_cbox = {
+	type = "fixed",
+	fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 }
+}
+
+minetest.register_node(":homedecor:openframe_bookshelf", {
+	description = "Bookshelf (open-frame)",
+	drawtype = "mesh",
+	mesh = "homedecor_openframe_bookshelf.obj",
+	tiles = {
+		"homedecor_openframe_bookshelf_books.png",
+		"default_wood.png"
+	},
+	groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3},
+	sounds = default.node_sound_wood_defaults(),
+	selection_box = ob_cbox,
+	collision_box = ob_cbox,
+})
+
+local wd_cbox = {
+	type = "fixed",
+	fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 }
+}
+
+homedecor.register("wardrobe_bottom", {
+	mesh = "homedecor_bedroom_wardrobe.obj",
+	tiles = {
+		"homedecor_generic_wood_beech.png",
+		"homedecor_wardrobe_drawers.png",
+		"homedecor_wardrobe_doors.png"
+	},
+	inventory_image = "homedecor_wardrobe_inv.png",
+	description = "Wardrobe",
+	groups = {snappy=3},
+	selection_box = wd_cbox,
+	collision_box = wd_cbox,
+	sounds = default.node_sound_wood_defaults(),
+	expand = { top="air" },
+	infotext = S("Wardrobe cabinet"),
+	inventory = {
+		size=24,
+	},
+})
+
+minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe")
+minetest.register_alias("homedecor:wardrobe_top", "air")
+
+homedecor.register("wall_shelf", {
+	description = "Wall Shelf",
+	tiles = {
+		"homedecor_wood_table_large_edges.png",
+	},
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, 0.4, 0.47, 0.5, 0.47, 0.5},
+			{-0.5, 0.47, -0.1875, 0.5, 0.5, 0.5}
+		}
+	}
+})
+
+local ofchairs_sbox = {
+		type = "fixed",
+		fixed = { -8/16, -8/16, -8/16, 8/16, 29/32, 8/16 }
+	}
+
+local ofchairs_cbox = {
+		type = "fixed",
+		fixed = {
+			{ -5/16,   1/16, -7/16,  5/16,   4/16,  7/16 }, -- seat
+			{ -5/16,   4/16,  4/16,  5/16,  29/32, 15/32 }, -- seatback
+			{ -1/16, -11/32, -1/16,  1/16,   1/16,  1/16 }, -- cylinder
+			{ -8/16,  -8/16, -8/16,  8/16, -11/32,  8/16 }  -- legs/wheels
+		}
+	}
+
+local ofchairs = {"basic", "upscale"}
+
+for _, c in ipairs(ofchairs) do
+
+homedecor.register("office_chair_"..c, {
+	description = "Office chair ("..c..")",
+	drawtype = "mesh",
+	tiles = { "homedecor_office_chair_"..c..".png" },
+	mesh = "homedecor_office_chair_"..c..".obj",
+	groups = { snappy = 3 },
+	sounds = default.node_sound_wood_defaults(),
+	selection_box = ofchairs_sbox,
+	collision_box = ofchairs_cbox,
+	expand = { top = "air" },
+})
+
+end
+
 -- Sitting functions disabled for now because of buggyness.
 
 --[[
@@ -44,357 +248,6 @@ function homedecor.sit_exec(pos, node, clicker) -- don't move these functions in
 end
 --]]
 
-local table_colors = { "", "mahogany", "white" }
-
-for _, i in ipairs(table_colors) do
-	local color = "_"..i
-	local color2 = "_"..i
-	local desc = S("Table ("..i..")")
-
-	if i == "" then
-		color = ""
-		color2 = "_beech"
-		desc = S("Table")
-	end
-
-	homedecor.register("table"..color, {
-		description = desc,
-		tiles = { "homedecor_generic_wood"..color2..".png" },
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{ -0.4, -0.5, -0.4, -0.3,  0.4, -0.3 },
-				{  0.3, -0.5, -0.4,  0.4,  0.4, -0.3 },
-				{ -0.4, -0.5,  0.3, -0.3,  0.4,  0.4 },
-				{  0.3, -0.5,  0.3,  0.4,  0.4,  0.4 },
-				{ -0.5,  0.4, -0.5,  0.5,  0.5,  0.5 },
-				{ -0.4, -0.2, -0.3, -0.3, -0.1,  0.3 },
-				{  0.3, -0.2, -0.4,  0.4, -0.1,  0.3 },
-				{ -0.3, -0.2, -0.4,  0.4, -0.1, -0.3 },
-				{ -0.3, -0.2,  0.3,  0.3, -0.1,  0.4 },
-			},
-		},
-		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
-	})
-end
-
-local chaircolors = {
-	{ "", "plain" },
-	{ "black", "Black" },
-	{ "red", "Red" },
-	{ "pink", "Pink" },
-	{ "violet", "Violet" },
-	{ "blue", "Blue" },
-	{ "dark_green", "Dark Green" },
-}
-
-local kc_cbox = {
-	type = "fixed",
-	fixed = { -0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125 },
-}
-
-for i in ipairs(chaircolors) do
-
-	local color = "_"..chaircolors[i][1]
-	local color2 = chaircolors[i][1]
-	local name = S(chaircolors[i][2])
-	local chairtiles = {
-		"homedecor_generic_wood_beech.png",
-		"wool"..color..".png",
-	}
-
-	if chaircolors[i][1] == "" then
-		color = ""
-		chairtiles = {
-			"homedecor_generic_wood_beech.png",
-			"homedecor_generic_wood_beech.png"
-		}
-	end
-
-	homedecor.register("chair"..color, {
-		description = S("Kitchen chair (%s)"):format(name),
-		mesh = "homedecor_kitchen_chair.obj",
-		tiles = chairtiles,
-		selection_box = kc_cbox,
-		collision_box = kc_cbox,
-		groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
-		--[[
-		on_rightclick = function(pos, node, clicker)
-			pos.y = pos.y-0 -- player's sit position.
-			homedecor.sit_exec(pos, node, clicker)
-		end,
-		--]]
-	})
-
-	if color ~= "" then
-		homedecor.register("armchair"..color, {
-			description = S("Armchair (%s)"):format(name),
-			mesh = "forniture_armchair.obj",
-			tiles = {
-				"wool"..color..".png",
-				"wool_dark_grey.png",
-				"default_wood.png"
-			},
-			sunlight_propagates = true,
-			groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
-			--[[
-			on_rightclick = function(pos, node, clicker)
-				pos.y = pos.y-0.1 -- player's sit position.
-				homedecor.sit_exec(pos, node, clicker)
-				clicker:set_hp(20)
-			end,
-			--]]
-		})
-
-		minetest.register_craft({
-			output = "homedecor:armchair"..color.." 2",
-			recipe = {
-			{ "wool:"..color2,""},
-			{ "group:wood","group:wood" },
-			{ "wool:"..color2,"wool:"..color2 },
-			},
-		})
-	end
-end
-
-local ob_cbox = {
-	type = "fixed",
-	fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 }
-}
-
-minetest.register_node(":homedecor:openframe_bookshelf", {
-	description = "Bookshelf (open-frame)",
-	drawtype = "mesh",
-	mesh = "homedecor_openframe_bookshelf.obj",
-	tiles = {
-		"homedecor_openframe_bookshelf_books.png",
-		"default_wood.png"
-	},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	is_ground_content = false,
-	groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3},
-	sounds = default.node_sound_wood_defaults(),
-	selection_box = ob_cbox,
-	collision_box = ob_cbox,
-})
-
-local bedcolors = {
-	"red",
-	"green",
-	"blue",
-	"violet",
-	"brown",
-	"darkgrey",
-	"orange",
-	"yellow",
-	"pink",
-}
-
-local bed_sbox = {
-	type = "fixed",
-	fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 }
-}
-
-local bed_cbox = {
-	type = "fixed",
-	fixed = { 
-		{ -0.5, -0.5, -0.5, 0.5, -0.05, 1.5 },
-		{ -0.5, -0.5, 1.44, 0.5, 0.5, 1.5 },
-		{ -0.5, -0.5, -0.5, 0.5, 0.18, -0.44 },
-	}
-}
-
-local kbed_sbox = {
-	type = "fixed",
-	fixed = { -0.5, -0.5, -0.5, 1.5, 0.5, 1.5 }
-}
-
-local kbed_cbox = {
-	type = "fixed",
-	fixed = { 
-		{ -0.5, -0.5, -0.5, 1.5, -0.05, 1.5 },
-		{ -0.5, -0.5, 1.44, 1.5, 0.5, 1.5 },
-		{ -0.5, -0.5, -0.5, 1.5, 0.18, -0.44 },
-	}
-}
-
-for _, color in ipairs(bedcolors) do
-	local color2=color
-	if color == "darkgrey" then
-		color2 = "dark_grey"
-	end
-	homedecor.register("bed_"..color.."_regular", {
-		mesh = "homedecor_bed_regular.obj",
-		tiles = {
-			"homedecor_bed_frame.png",
-			"default_wood.png",
-			"wool_white.png",
-			"wool_"..color2..".png",
-			"homedecor_bed_bottom.png",
-			"wool_"..color2..".png^[brighten", -- pillow
-		},
-		inventory_image = "homedecor_bed_"..color.."_inv.png",
-		description = S("Bed (%s)"):format(color),
-		groups = {snappy=3},
-		selection_box = bed_sbox,
-		collision_box = bed_cbox,
-		after_place_node = function(pos, placer, itemstack, pointed_thing)
-			if not placer:get_player_control().sneak then
-				return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, color)
-			end
-		end,
-		after_dig_node = function(pos)
-			homedecor.unextend_bed(pos, color)
-		end,
-		on_rightclick = function(pos, node, clicker)
-			if minetest.get_modpath("beds") then
-				beds.on_rightclick(pos, clicker)
-			else return end
-		end
-	})
-
-	homedecor.register("bed_"..color.."_extended", {
-		mesh = "homedecor_bed_extended.obj",
-		tiles = {
-			"homedecor_bed_frame.png",
-			"default_wood.png",
-			"wool_white.png",
-			"wool_"..color2..".png",
-			"homedecor_bed_bottom.png",
-			"wool_"..color2..".png^[brighten",
-		},
-		groups = {snappy=3, not_in_creative_inventory=1},
-		selection_box = bed_sbox,
-		collision_box = bed_cbox,
-		expand = { forward = "air" },
-		after_dig_node = function(pos)
-			homedecor.unextend_bed(pos, color)
-		end,
-		on_rightclick = function(pos, node, clicker)
-			if minetest.get_modpath("beds") then
-				beds.on_rightclick(pos, clicker)
-			else return end
-		end,
-		drop = "homedecor:bed_"..color.."_regular"
-	})
-
-	homedecor.register("bed_"..color.."_kingsize", {
-		mesh = "homedecor_bed_kingsize.obj",
-		tiles = {
-			"homedecor_bed_frame.png",
-			"default_wood.png",
-			"wool_white.png",
-			"wool_"..color2..".png",
-			"homedecor_bed_bottom.png",
-			"wool_"..color2..".png^[brighten",
-		},
-		inventory_image = "homedecor_bed_kingsize_"..color.."_inv.png",
-		description = S("Bed (%s, king sized)"):format(color),
-		groups = {snappy=3, not_in_creative_inventory=1},
-		selection_box = kbed_sbox,
-		collision_box = kbed_cbox,
-		after_dig_node = function(pos, oldnode, oldmetadata, digger)
-			local inv = digger:get_inventory()
-			if digger:get_player_control().sneak and inv:room_for_item("main", "bed_"..color.."_regular 1") then
-				inv:remove_item("main", "homedecor:bed_"..color.."_kingsize 1")
-				inv:add_item("main", "homedecor:bed_"..color.."_regular 2")
-			end
-		end,
-		on_rightclick = function(pos, node, clicker)
-			if minetest.get_modpath("beds") then
-				beds.on_rightclick(pos, clicker)
-			else return end
-		end
-	})
-
-	minetest.register_alias("homedecor:bed_"..color.."_foot",    "homedecor:bed_"..color.."_regular")
-	minetest.register_alias("homedecor:bed_"..color.."_footext", "homedecor:bed_"..color.."_extended")
-	minetest.register_alias("homedecor:bed_"..color.."_head",    "air")
-
-end
-
-local wd_cbox = {
-	type = "fixed",
-	fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 }
-}
-
-homedecor.register("wardrobe_bottom", {
-	mesh = "homedecor_bedroom_wardrobe.obj",
-	tiles = {
-		"homedecor_generic_wood_beech.png",
-		"homedecor_wardrobe_drawers.png",
-		"homedecor_wardrobe_doors.png"
-	},
-	inventory_image = "homedecor_wardrobe_inv.png",
-	description = "Wardrobe",
-	groups = {snappy=3},
-	selection_box = wd_cbox,
-	collision_box = wd_cbox,
-	expand = { top="air" },
-	infotext = S("Wardrobe cabinet"),
-	inventory = {
-		size=24,
-	},
-})
-
-minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe")
-minetest.register_alias("homedecor:wardrobe_top", "air")
-
-homedecor.register("wall_shelf", {
-	description = "Wall Shelf",
-	tiles = {
-		"homedecor_wood_table_large_edges.png",
-	},
-	groups = { snappy = 3 },
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, 0.4, 0.47, 0.5, 0.47, 0.5},
-			{-0.5, 0.47, -0.1875, 0.5, 0.5, 0.5}
-		}
-	}
-})
-
-local ofchairs_sbox = {
-		type = "fixed",
-		fixed = { -8/16, -8/16, -8/16, 8/16, 29/32, 8/16 }
-	}
-
-local ofchairs_cbox = {
-		type = "fixed",
-		fixed = {
-			{ -5/16,   1/16, -7/16,  5/16,   4/16,  7/16 }, -- seat
-			{ -5/16,   4/16,  4/16,  5/16,  29/32, 15/32 }, -- seatback
-			{ -1/16, -11/32, -1/16,  1/16,   1/16,  1/16 }, -- cylinder
-			{ -8/16,  -8/16, -8/16,  8/16, -11/32,  8/16 }  -- legs/wheels
-		}
-	}
-
-local ofchairs = {"basic", "upscale"}
-
-for _, c in ipairs(ofchairs) do
-
-homedecor.register("office_chair_"..c, {
-	description = "Office chair ("..c..")",
-	drawtype = "mesh",
-	tiles = { "homedecor_office_chair_"..c..".png" },
-	mesh = "homedecor_office_chair_"..c..".obj",
-	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
-	selection_box = ofchairs_sbox,
-	collision_box = ofchairs_cbox,
-	expand = { top = "air" },
-	--[[
-	on_rightclick = function(pos, node, clicker)
-		pos.y = pos.y+0.14 -- player's sit position.
-		homedecor.sit_exec(pos, node, clicker)
-	end,
-	--]]
-})
-
-end
-
 -- Aliases for 3dforniture mod.
 
 minetest.register_alias("3dforniture:table", "homedecor:table")
diff --git a/homedecor/furniture_medieval.lua b/homedecor/furniture_medieval.lua
index a080baa2..e7c1b8af 100644
--- a/homedecor/furniture_medieval.lua
+++ b/homedecor/furniture_medieval.lua
@@ -4,7 +4,6 @@ local S = homedecor.gettext
 homedecor.register("bars", {
 	description = S("Bars"),
 	tiles = { "homedecor_generic_metal_black.png" },
-	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -19,14 +18,14 @@ homedecor.register("bars", {
 		type = "fixed",
 		fixed = { -0.5, -0.5, -0.1, 0.5, 0.5, 0.1 },
 	},
-	groups = {cracky=1},
+	groups = {cracky=3},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 --L Binding Bars
 homedecor.register("L_binding_bars", {
 	description = S("Binding Bars"),
 	tiles = { "homedecor_generic_metal_black.png" },
-	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -39,7 +38,8 @@ homedecor.register("L_binding_bars", {
 			{ -0.05,  0.45, -0.50,  0.05,  0.50,  0.00 },
 		},
 	},
-	groups = {cracky=1,}
+	groups = {cracky=3},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 local chain_cbox = {
@@ -52,10 +52,10 @@ homedecor.register("chains", {
 	mesh = "forniture_chains.obj",
 	tiles = { "homedecor_generic_metal_black.png" },
 	inventory_image="forniture_chains_inv.png",
-	sunlight_propagates = true,
 	selection_box = chain_cbox,
-	collision_box = chain_cbox,
-	groups = {cracky=1},
+	walkable = false,
+	groups = {cracky=3},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 homedecor.register("torch_wall", {
@@ -76,14 +76,13 @@ homedecor.register("torch_wall", {
 		"forniture_coal.png",
 	},
 	inventory_image="forniture_torch_inv.png",
-	sunlight_propagates = true,
 	walkable = false,
 	light_source = 14,
 	selection_box = {
 		type = "fixed",
 		fixed = { -0.15, -0.45, 0.15, 0.15,0.35, 0.5 },
 	},
-	groups = {cracky=2},
+	groups = {cracky=3},
 })
 
 local wl_cbox = {
@@ -99,7 +98,7 @@ homedecor.register("wall_lamp", {
 	groups = {snappy=3},
 	light_source = 11,
 	selection_box = wl_cbox,
-	collision_box = wl_cbox
+	walkable = false
 })
 
 minetest.register_alias("3dforniture:bars", "homedecor:bars")
diff --git a/homedecor/init.lua b/homedecor/init.lua
index 8ed64496..091ff5f4 100644
--- a/homedecor/init.lua
+++ b/homedecor/init.lua
@@ -135,7 +135,6 @@ dofile(homedecor.modpath.."/nightstands.lua")
 dofile(homedecor.modpath.."/clocks.lua")
 dofile(homedecor.modpath.."/misc-electrical.lua")
 
-dofile(homedecor.modpath.."/paintings.lua")
 dofile(homedecor.modpath.."/window_treatments.lua")
 
 dofile(homedecor.modpath.."/furniture.lua")
@@ -144,6 +143,7 @@ dofile(homedecor.modpath.."/furniture_recipes.lua")
 dofile(homedecor.modpath.."/climate-control.lua")
 
 dofile(homedecor.modpath.."/cobweb.lua")
+dofile(homedecor.modpath.."/beds.lua")
 dofile(homedecor.modpath.."/books.lua")
 dofile(homedecor.modpath.."/exterior.lua")
 dofile(homedecor.modpath.."/trash_cans.lua")
diff --git a/homedecor/kitchen_appliances.lua b/homedecor/kitchen_appliances.lua
index 18242d97..f9bbcc4e 100644
--- a/homedecor/kitchen_appliances.lua
+++ b/homedecor/kitchen_appliances.lua
@@ -3,13 +3,13 @@
 local S = homedecor.gettext
 
 -- 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="air" },
@@ -21,7 +21,6 @@ homedecor.register("refrigerator_steel", {
 })
 
 -- white, enameled fridge
-
 homedecor.register("refrigerator_white", {
 	mesh = "homedecor_refrigerator.obj",
 	tiles = { "homedecor_refrigerator_white.png" },
@@ -30,6 +29,7 @@ homedecor.register("refrigerator_white", {
 	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="air" },
 	infotext=S("Refrigerator"),
 	inventory = {
@@ -51,7 +51,6 @@ minetest.register_alias("homedecor:refrigerator_steel_bottom_locked", "homedecor
 minetest.register_alias("homedecor:refrigerator_steel_top_locked", "air")
 
 -- kitchen "furnaces"
-
 homedecor.register_furnace("homedecor:oven", {
 	description = S("Oven"),
 	tile_format = "homedecor_oven_%s%s.png",
@@ -86,7 +85,6 @@ homedecor.register_furnace("homedecor:microwave_oven", {
 	extra_nodedef_fields = {
 		drawtype = "nodebox",
 		paramtype = "light",
-		--paramtype2 = "facedir", -- Not needed, set by register_furnace
 		node_box = {
 			type = "fixed",
 			fixed = { { -0.5, -0.5, -0.125, 0.5, 0.125, 0.5 } },
@@ -115,9 +113,7 @@ homedecor.register("coffee_maker", {
 	},
 	description = "Coffee Maker",
 	inventory_image = "homedecor_coffeemaker_inv.png",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	sunlight_propagates = true,
+	walkable = false,
 	groups = {snappy=3},
 	selection_box = cm_cbox,
 	node_box = cm_cbox
@@ -160,20 +156,10 @@ minetest.register_abm({
 })
 
 homedecor.register("toaster", {
-        description = "Toaster",
-	tiles = {
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png",
-		"homedecor_toaster_sides.png"
-	},
+	description = "Toaster",
+	tiles = { "homedecor_toaster_sides.png" },
 	inventory_image = "homedecor_toaster_inv.png",
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	sunlight_propagates = true,
+	walkable = false,
 	groups = { snappy=3 },
 	node_box = {
 		type = "fixed",
@@ -201,10 +187,7 @@ homedecor.register("toaster_loaf", {
 		"homedecor_toaster_sides.png",
 		"homedecor_toaster_sides.png"
 	},
-	drawtype = "nodebox",
-	paramtype = "light",
-	paramtype2 = "facedir",
-	sunlight_propagates = true,
+	walkable = false,
 	groups = { snappy=3, not_in_creative_inventory=1 },
 	node_box = {
 		type = "fixed",
@@ -233,8 +216,6 @@ homedecor.register("dishwasher", {
 		"homedecor_dishwasher_back.png",
 		"homedecor_dishwasher_front.png"
 	},
-	paramtype = "light",
-	paramtype2 = "facedir",
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -244,7 +225,7 @@ homedecor.register("dishwasher", {
 			{-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 },
 })
 
@@ -261,8 +242,7 @@ homedecor.register("dishwasher_"..m, {
 		"homedecor_dishwasher_back.png",
 		"homedecor_dishwasher_front.png"
 	},
-	paramtype = "light",
-	paramtype2 = "facedir",
 	groups = { snappy = 3 },
+	sounds = default.node_sound_stone_defaults(),
 })
 end
diff --git a/homedecor/kitchen_furniture.lua b/homedecor/kitchen_furniture.lua
index b66e52a6..58ee196c 100644
--- a/homedecor/kitchen_furniture.lua
+++ b/homedecor/kitchen_furniture.lua
@@ -79,7 +79,7 @@ homedecor.register("copper_pans", {
 	inventory_image = "homedecor_copper_pans_inv.png",
 	groups = { snappy=3 },
 	selection_box = cp_cbox,
-	collision_box = cp_cbox,
+	walkable = false,
 	on_place = minetest.rotate_node
 })
 
@@ -95,7 +95,7 @@ homedecor.register("kitchen_faucet", {
 	description = "Kitchen Faucet",
 	groups = {snappy=3},
 	selection_box = kf_cbox,
-	collision_box = kf_cbox,
+	walkable = false
 })
 
 homedecor.register("paper_towel", {
@@ -107,13 +107,9 @@ homedecor.register("paper_towel", {
 	inventory_image = "homedecor_paper_towel_inv.png",
 	description = "Paper towels",
 	groups = { snappy=3 },
+	walkable = false,
 	selection_box = {
 		type = "fixed",
 		fixed = { -0.4375, 0.125, 0.0625, 0.4375, 0.4375, 0.5 }
 	},
-	collision_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
index 4a63d0eb..49ef9aed 100644
--- a/homedecor/laundry.lua
+++ b/homedecor/laundry.lua
@@ -17,7 +17,6 @@ homedecor.register("washing_machine", {
 			{-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5},
 		}
 	},
-	selection_box = { type = "regular" },
 	groups = { snappy = 3 },
 })
 
@@ -38,7 +37,6 @@ homedecor.register("dryer", {
 			{-0.5, -0.5, 0.3125, 0.5, 0.5, 0.5},
 		}
 	},
-	selection_box = { type = "regular" },
 	groups = { snappy = 3 },
 })
 
@@ -59,4 +57,3 @@ homedecor.register("ironing_board", {
 	selection_box = ib_cbox,
 	collision_box = ib_cbox
 })
-
diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua
index d49e5651..5f69ffa3 100644
--- a/homedecor/lighting.lua
+++ b/homedecor/lighting.lua
@@ -1,4 +1,3 @@
-
 -- This file supplies glowlights
 
 local dirs1 = { 20, 23, 22, 21 }
@@ -83,7 +82,7 @@ homedecor.register("glowlight_half_"..color, {
 	node_box = glowlight_nodebox.half,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -101,7 +100,7 @@ homedecor.register("glowlight_quarter_"..color, {
 	node_box = glowlight_nodebox.quarter,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-1,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -121,7 +120,7 @@ homedecor.register("glowlight_small_cube_"..color, {
 	node_box = glowlight_nodebox.small_cube,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-1,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -163,8 +162,7 @@ homedecor.register("candle", {
 	},
 	inventory_image = "homedecor_candle_inv.png",
 	selection_box = tc_cbox,
-	collision_box = tc_cbox,
-	sunlight_propagates = true,
+	walkable = false,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-4,
 })
@@ -185,8 +183,6 @@ homedecor.register("candle_thin", {
 	},
 	inventory_image = "homedecor_candle_thin_inv.png",
 	selection_box = c_cbox,
-	collision_box = c_cbox,
-	sunlight_propagates = true,
 	walkable = false,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-4,
@@ -209,8 +205,6 @@ homedecor.register("candlestick_wrought_iron", {
 	},
 	inventory_image = "homedecor_candlestick_wrought_iron_inv.png",
 	selection_box = cs_cbox,
-	collision_box = cs_cbox,
-	sunlight_propagates = true,
 	walkable = false,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-4,
@@ -226,8 +220,6 @@ homedecor.register("candlestick_brass", {
 	},
 	inventory_image = "homedecor_candlestick_brass_inv.png",
 	selection_box = cs_cbox,
-	collision_box = cs_cbox,
-	sunlight_propagates = true,
 	walkable = false,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-4,
@@ -247,7 +239,6 @@ homedecor.register("wall_sconce", {
 		type = "fixed",
 		fixed = { -0.1875, -0.25, 0.3125, 0.1875, 0.25, 0.5 }
 	},
-	sunlight_propagates = true,
 	walkable = false,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-4,
@@ -271,9 +262,8 @@ homedecor.register("oil_lamp", {
 		"homedecor_oil_lamp_top.png",
 	},
 	inventory_image = "homedecor_oil_lamp_inv.png",
-	sunlight_propagates = true,
 	selection_box = ol_cbox,
-	collision_box = ol_cbox,
+	walkable = false,
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-3,
 	sounds = default.node_sound_glass_defaults(),
@@ -307,7 +297,7 @@ homedecor.register("ground_lantern", {
 	groups = {snappy=3},
 	light_source = 11,
 	selection_box = gl_cbox,
-	collision_box = gl_cbox
+	walkable = false
 })
 
 local hl_cbox = {
@@ -324,7 +314,7 @@ homedecor.register("hanging_lantern", {
 	groups = {snappy=3},
 	light_source = 11,
 	selection_box = hl_cbox,
-	collision_box = hl_cbox
+	walkable = false
 })
 
 local cl_cbox = {
@@ -341,7 +331,7 @@ homedecor.register("ceiling_lantern", {
 	groups = {snappy=3},	
 	light_source = 11,
 	selection_box = cl_cbox,
-	collision_box = cl_cbox,
+	walkable = false
 })
 
 homedecor.register("lattice_lantern_large", {
@@ -349,7 +339,7 @@ homedecor.register("lattice_lantern_large", {
 	tiles = { 'homedecor_lattice_lantern_large.png' },
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 homedecor.register("lattice_lantern_small", {
@@ -369,7 +359,7 @@ homedecor.register("lattice_lantern_small", {
 	},
 	groups = { snappy = 3 },
 	light_source = LIGHT_MAX-1,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -422,7 +412,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
 		walkable = false,
 		light_source = light,
 		selection_box = tlamp_cbox,
-		collision_box = tlamp_cbox,
+		sounds = default.node_sound_wood_defaults(),
 		groups = {cracky=2,oddly_breakable_by_hand=1,
 			not_in_creative_inventory=((light ~= nil) and 1) or nil,
 		},
@@ -451,7 +441,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
 			not_in_creative_inventory=((light ~= nil) and 1) or nil,
 		},
 		selection_box = slamp_cbox,
-		collision_box = slamp_cbox,
+		sounds = default.node_sound_wood_defaults(),
 		on_punch = function(pos, node, puncher)
 			node.name = "homedecor:standing_lamp"..lampcolor.."_"..repl[suffix]
 			minetest.set_node(pos, node)
@@ -491,7 +481,7 @@ for _, color in ipairs(dlamp_colors) do
 		inventory_image = "homedecor_desk_lamp_inv_"..color..".png",
 		wield_image = "homedecor_desk_lamp_inv_"..color..".png",
 		selection_box = dlamp_cbox,
-		collision_box = dlamp_cbox,
+		walkable = false,
 		groups = {snappy=3},
 	})
 end
@@ -508,6 +498,7 @@ homedecor.register("ceiling_lamp", {
 	inventory_image = "homedecor_ceiling_lamp_inv.png",
 	light_source = LIGHT_MAX,
 	groups = {snappy=3},
+	walkable = false,
 	on_punch = function(pos, node, puncher)
 		minetest.set_node(pos, {name = "homedecor:ceiling_lamp_off"})
 	end,
@@ -523,9 +514,9 @@ homedecor.register("ceiling_lamp_off", {
 		"homedecor_generic_plastic_brown.png",
 	},
 	groups = {snappy=3, not_in_creative_inventory=1},
+	walkable = false,
 	on_punch = function(pos, node, puncher)
 		minetest.set_node(pos, {name = "homedecor:ceiling_lamp"})
 	end,
 	drop = "homedecor:ceiling_lamp"
 })
-
diff --git a/homedecor/misc-electrical.lua b/homedecor/misc-electrical.lua
index a3a0187c..001c7035 100644
--- a/homedecor/misc-electrical.lua
+++ b/homedecor/misc-electrical.lua
@@ -22,7 +22,7 @@ homedecor.register("power_outlet", {
 		}
 	},
 	groups = {cracky=3,dig_immediate=2},
-	sounds = default.node_sound_stone_defaults()
+	walkable = false
 })
 
 homedecor.register("light_switch", {
@@ -51,7 +51,7 @@ homedecor.register("light_switch", {
 		}
 	},
 	groups = {cracky=3,dig_immediate=2},
-	sounds = default.node_sound_stone_defaults()
+	walkable = false
 })
 
 
@@ -60,6 +60,7 @@ homedecor.register("doorbell", {
 	inventory_image = "homedecor_doorbell_inv.png",
 	description = "Doorbell",
     groups = {snappy=3},
+    walkable = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -75,4 +76,3 @@ homedecor.register("doorbell", {
 		})
 	end
 })
-
diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua
index 497aac40..a68a046b 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor/misc-nodes.lua
@@ -6,11 +6,10 @@ homedecor.register("ceiling_paint", {
 	tiles = { 'homedecor_ceiling_paint.png' },
 	inventory_image = 'homedecor_ceiling_paint_roller.png',
 	wield_image = 'homedecor_ceiling_paint_roller.png',
-	sunlight_propagates = true,
 	walkable = false,
 	groups = { snappy = 3 },
 	sounds = default.node_sound_leaves_defaults(),
-        selection_box = { type = "wallmounted" },
+	selection_box = { type = "wallmounted" },
 })
 
 homedecor.register("ceiling_tile", {
@@ -19,11 +18,10 @@ homedecor.register("ceiling_tile", {
 	tiles = { 'homedecor_ceiling_tile.png' },
 	wield_image = 'homedecor_ceiling_tile.png',
 	inventory_image = 'homedecor_ceiling_tile.png',
-	sunlight_propagates = true,
 	walkable = false,
 	groups = { snappy = 3 },
 	sounds = default.node_sound_leaves_defaults(),
-        selection_box = { type = "wallmounted" },
+	selection_box = { type = "wallmounted" },
 })
 
 local rug_sizes = {"small", "large"}
@@ -35,7 +33,6 @@ homedecor.register("rug_"..s, {
 	tiles = {"homedecor_rug_"..s..".png"},
 	wield_image = "homedecor_rug_"..s..".png",
 	inventory_image = "homedecor_rug_"..s..".png",
-	sunlight_propagates = true,
 	paramtype2 = "wallmounted",
 	walkable = false,
 	groups = {snappy = 3},
@@ -55,7 +52,7 @@ homedecor.register("flower_pot_"..p, {
 		"homedecor_potting_soil.png"
 	},
 	groups = { snappy = 3, potting_soil=1 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_stone_defaults(),
 })
 end
 
@@ -153,7 +150,6 @@ homedecor.register("fishtank", {
 		type = "fixed",
 		fixed = { -0.5, -0.5, -0.375, 0.5, 0.3125, 0.375 }
 	},
-	sunlight_propagates = true,
 	groups = {cracky=3,oddly_breakable_by_hand=3},
 	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker)
@@ -189,7 +185,6 @@ homedecor.register("fishtank_lighted", {
 		type = "fixed",
 		fixed = { -0.5, -0.5, -0.375, 0.5, 0.3125, 0.375 }
 	},
-	sunlight_propagates = true,
 	groups = {cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
 	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker)
@@ -206,7 +201,6 @@ homedecor.register("cardboard_box_big", {
 		'homedecor_cardbox_big_sides.png',
 	},
 	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
 	infotext=S("Cardboard box"),
 	inventory = {
 		size=24,
@@ -227,7 +221,6 @@ homedecor.register("cardboard_box", {
 		}
 	},
 	groups = { snappy = 3 },
-	sounds = default.node_sound_wood_defaults(),
 	infotext=S("Cardboard box"),
 	inventory = {
 		size=8,
@@ -243,7 +236,7 @@ homedecor.register("dvd_cd_cabinet", {
 		"homedecor_dvdcd_cabinet_back.png"
 	},
 	selection_box = homedecor.nodebox.slab_z(0.5),
-	groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3},
+	groups = {choppy=2,oddly_breakable_by_hand=2},
 	sounds = default.node_sound_wood_defaults(),
 })
 
@@ -283,6 +276,7 @@ homedecor.register("pool_table", {
 	selection_box = pooltable_cbox,
 	collision_box = pooltable_cbox,
 	expand = { forward="air" },
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_alias("homedecor:pool_table_2", "air")
@@ -291,7 +285,8 @@ homedecor.register("coatrack_wallmount", {
 	tiles = { "homedecor_generic_wood_beech.png" },
 	inventory_image = "homedecor_coatrack_wallmount_inv.png",
 	description = "Coatrack (wallmounted)",
-        groups = {snappy=3},
+	groups = {snappy=3},
+	sounds = default.node_sound_wood_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -317,21 +312,13 @@ homedecor.register("coat_tree", {
 	inventory_image = "homedecor_coatrack_inv.png",
 	description = "Coat tree",
 	groups = {snappy=3},
+	sounds = default.node_sound_wood_defaults(),
 	expand = { top="air" },
+	walkable = false,
 	selection_box = {
 		type = "fixed",
 		fixed = { -0.4, -0.5, -0.4, 0.4, 1.5, 0.4 }
 	},
-	node_box = {	-- this is used here to create a multi-part collision box.
-		type = "fixed",
-		fixed = {
-			{  -8/16, 18/16,  -8/16,  8/16, 22/16,  8/16 },
-			{  -4/16, 12/16,  -4/16,  4/16, 18/16,  4/16 },
-			{ -10/32, 10/16, -10/32, 10/32, 12/16, 10/32 },
-			{  -1/16,  1/16,  -1/16,  1/16, 10/16,  1/16 },
-			{ -10/32, -8/16, -10/32, 10/32,  1/16, 10/32 }
-		}
-	},
 })
 
 local cutlery_cbox = {
@@ -350,7 +337,8 @@ homedecor.register("cutlery_set", {
 	description = "Cutlery set",
 	groups = {snappy=3},
 	selection_box = cutlery_cbox,
-	collision_box = cutlery_cbox
+	walkable = false,
+	sounds = default.node_sound_glass_defaults(),
 })
 
 local bottle_cbox = {
@@ -376,10 +364,9 @@ for _, b in ipairs(bottle_colors) do
 		inventory_image = "homedecor_bottle_"..b.."_inv.png",
 		description = "Bottle ("..b..")",
 		mesh = "homedecor_bottle.obj",
-		sunlight_propagates = true,
+		walkable = false,
 		groups = {snappy=3},
 		sounds = default.node_sound_glass_defaults(),
-		collision_box = bottle_cbox,
 		selection_box = bottle_cbox
 	})
 
@@ -393,10 +380,9 @@ for _, b in ipairs(bottle_colors) do
 		inventory_image = "homedecor_4_bottles_"..b.."_inv.png",
 		description = "Four "..b.." bottles",
 		mesh = "homedecor_4_bottles.obj",
-		sunlight_propagates = true,
+		walkable = false,
 		groups = {snappy=3},
 		sounds = default.node_sound_glass_defaults(),
-		collision_box = fbottle_cbox,
 		selection_box = fbottle_cbox
 	})
 end
@@ -409,10 +395,9 @@ homedecor.register("4_bottles_multi", {
 	inventory_image = "homedecor_4_bottles_multi_inv.png",
 	description = "Four misc brown/green bottles",
 	mesh = "homedecor_4_bottles.obj",
-	sunlight_propagates = true,
 	groups = {snappy=3},
+	walkable = false,
 	sounds = default.node_sound_glass_defaults(),
-	collision_box = fbottle_cbox,
 	selection_box = fbottle_cbox
 })
 
@@ -423,14 +408,13 @@ homedecor.register("dartboard", {
 	inventory_image = "homedecor_dartboard_inv.png",
 	wield_image = "homedecor_dartboard_inv.png",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,
 	walkable = false,
 	selection_box = {
 		type = "wallmounted",
 	},
 	groups = {choppy=2,dig_immediate=2,attached_node=1},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 })
 
 local piano_cbox = {
@@ -451,6 +435,7 @@ homedecor.register("piano", {
 	selection_box = piano_cbox,
 	collision_box = piano_cbox,
 	expand = { right="air" },
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_alias("homedecor:piano_left", "homedecor:piano")
@@ -470,8 +455,8 @@ homedecor.register("trophy", {
 	},
 	inventory_image = "homedecor_trophy_inv.png",
 	groups = { snappy=3 },
+	walkable = false,
 	selection_box = tr_cbox,
-	collision_box = tr_cbox,
 })
 
 local sb_cbox = {
@@ -491,7 +476,8 @@ homedecor.register("sportbench", {
 	inventory_image = "homedecor_sport_bench_inv.png",
 	groups = { snappy=3 },
 	selection_box = sb_cbox,
-	collision_box = sb_cbox,
+	walkable = false,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 local skate_cbox = {
@@ -507,7 +493,7 @@ homedecor.register("skateboard", {
 	description = "Skateboard",
 	groups = {snappy=3},
 	selection_box = skate_cbox,
-	collision_box = skate_cbox,
+	walkable = false,
 	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
@@ -524,6 +510,7 @@ homedecor.register("beer_tap", {
 	},
 	inventory_image = "homedecor_beertap_inv.png",
 	groups = { snappy=3 },
+	walkable = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -572,9 +559,9 @@ homedecor.register("beer_mug", {
 	tiles = { "homedecor_beer_mug.png" },
 	inventory_image = "homedecor_beer_mug_inv.png",
 	groups = { snappy=3, oddly_breakable_by_hand=3 },
+	walkable = false,
 	sounds = default.node_sound_glass_defaults(),
-	selection_box = beer_cbox,
-	collision_box = beer_cbox
+	selection_box = beer_cbox
 })
 
 homedecor.register("tool_cabinet", {
@@ -607,7 +594,6 @@ homedecor.register("calendar", {
 	inventory_image = "homedecor_calendar_inv.png",
 	wield_image = "homedecor_calendar_inv.png",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,
 	walkable = false,
 	selection_box = {
 		type = "wallmounted",
@@ -618,6 +604,11 @@ homedecor.register("calendar", {
 	groups = {choppy=2,attached_node=1},
 	legacy_wallmounted = true,
 	sounds = default.node_sound_defaults(),
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		local date = os.date("%Y-%m-%d") -- ISO 8601 format
+		meta:set_string("infotext", "Date: "..date)
+	end
 })
 
 local globe_cbox = {
@@ -637,7 +628,8 @@ homedecor.register("desk_globe", {
 	selection_box = globe_cbox,
 	collision_box = globe_cbox,
 	groups = {choppy=2},
-	sounds = default.node_sound_defaults(),
+	walkable = false,
+	sounds = default.node_sound_wood_defaults(),
 })
 
 local wine_cbox = homedecor.nodebox.slab_z(0.25)
@@ -677,7 +669,34 @@ for _, i in ipairs(n) do
 		wield_image = "homedecor_picture_frame"..i.."_inv.png",
 		groups = {snappy = 3},
 		selection_box = pframe_cbox,
-		collision_box = pframe_cbox,
+		walkable = false,
+		sounds = default.node_sound_glass_defaults()
+	})
+end
+
+for i = 1,20 do
+	homedecor.register("painting_"..i, {
+		description = "Decorative painting #"..i,
+		tiles = {
+			"homedecor_painting_edges.png",
+			"homedecor_painting_edges.png",
+			"homedecor_painting_edges.png",
+			"homedecor_painting_edges.png",
+			"homedecor_painting_back.png",
+			"homedecor_painting"..i..".png"
+		},
+		node_box = {
+			type = "fixed",
+			fixed = {
+				{ -32/64, -32/64, 28/64, -30/64,  32/64, 32/64 }, -- left edge
+				{  30/64, -32/64, 28/64,  32/64,  32/64, 32/64 }, -- right edge
+				{ -32/64,  30/64, 28/64,  32/64,  32/64, 32/64 }, -- top edge
+				{ -32/64, -30/64, 28/64,  32/64, -32/64, 32/64 }, -- bottom edge
+				{ -32/64, -32/64, 29/64,  32/64,  32/64, 29/64 }  -- the canvas
+			}
+		},
+		groups = {snappy=3},
+		sounds = default.node_sound_wood_defaults(),
 	})
 end
 
@@ -754,4 +773,3 @@ for _, side in ipairs({"left", "right"}) do
 		})
 	end
 end
-
diff --git a/homedecor/nightstands.lua b/homedecor/nightstands.lua
index a7b3187d..caf29880 100644
--- a/homedecor/nightstands.lua
+++ b/homedecor/nightstands.lua
@@ -11,7 +11,6 @@ homedecor.register("nightstand_"..w.."_one_drawer", {
 			'homedecor_nightstand_'..w..'_left.png',
 			'homedecor_nightstand_'..w..'_back.png',
 			'homedecor_nightstand_'..w..'_1_drawer_front.png'},
-	selection_box = { type = "regular" },
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -39,7 +38,6 @@ homedecor.register("nightstand_"..w.."_two_drawers", {
 			'homedecor_nightstand_'..w..'_left.png',
 			'homedecor_nightstand_'..w..'_back.png',
 			'homedecor_nightstand_'..w..'_2_drawer_front.png'},
-	selection_box = { type = "regular" },
 	node_box = {
 		type = "fixed",
 		fixed = {
diff --git a/homedecor/paintings.lua b/homedecor/paintings.lua
deleted file mode 100644
index 68952a82..00000000
--- a/homedecor/paintings.lua
+++ /dev/null
@@ -1,26 +0,0 @@
---Various kinds of paintings
-
-for i = 1,20 do
-	homedecor.register("painting_"..i, {
-		description = "Decorative painting #"..i,
-		tiles = {
-			"homedecor_painting_edges.png",
-			"homedecor_painting_edges.png",
-			"homedecor_painting_edges.png",
-			"homedecor_painting_edges.png",
-			"homedecor_painting_back.png",
-			"homedecor_painting"..i..".png"
-		},
-		node_box = {
-			type = "fixed",
-			fixed = {
-				{ -32/64, -32/64, 28/64, -30/64,  32/64, 32/64 }, -- left edge
-				{  30/64, -32/64, 28/64,  32/64,  32/64, 32/64 }, -- right edge
-				{ -32/64,  30/64, 28/64,  32/64,  32/64, 32/64 }, -- top edge
-				{ -32/64, -30/64, 28/64,  32/64, -32/64, 32/64 }, -- bottom edge
-				{ -32/64, -32/64, 29/64,  32/64,  32/64, 29/64 }  -- the canvas
-			}
-		},
-		groups = {snappy=3},
-	})
-end
diff --git a/homedecor/shingles.lua b/homedecor/shingles.lua
index 58c40bc6..be0e9706 100644
--- a/homedecor/shingles.lua
+++ b/homedecor/shingles.lua
@@ -6,10 +6,8 @@ minetest.register_node("homedecor:skylight", {
 	tiles = { "default_glass.png" },
 	wield_image = "default_glass.png",
 	inventory_image = "homedecor_skylight_inv.png",
-	paramtype = "light",
-	sunlight_propagates = true,
 	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	selection_box = homedecor.nodebox.slab_y(0.1),
 })
 
@@ -19,11 +17,9 @@ minetest.register_node("homedecor:skylight_frosted", {
 	tiles = { "homedecor_skylight_frosted.png" },
 	wield_image = "homedecor_skylight_frosted.png",
 	inventory_image = "homedecor_skylight_frosted_inv.png",
-	paramtype = "light",
-	sunlight_propagates = true,
 	use_texture_alpha = true,
 	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	selection_box = homedecor.nodebox.slab_y(0.1),
 })
 
@@ -39,7 +35,7 @@ minetest.register_node("homedecor:shingles_"..s, {
 	paramtype = "light",
 	walkable = false,
 	groups = { snappy = 3 },
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	selection_box = homedecor.nodebox.slab_y(0.1),
 })
 end
diff --git a/homedecor/shutters.lua b/homedecor/shutters.lua
index 4b357e55..64b6c9cc 100644
--- a/homedecor/shutters.lua
+++ b/homedecor/shutters.lua
@@ -33,7 +33,6 @@ for i in ipairs(shutters) do
 		description = S("Wooden Shutter ("..desc..")"),
 		inventory_image = "homedecor_window_shutter_"..name.."_inv.png",
 		wield_image = "homedecor_window_shutter_"..name.."_inv.png",
-		paramtype = "light",
 		paramtype2 = "wallmounted",
 		groups = { snappy = 3 },
 		sounds = default.node_sound_wood_defaults(),
diff --git a/homedecor/slopes.lua b/homedecor/slopes.lua
index ec13a550..fa0496dd 100644
--- a/homedecor/slopes.lua
+++ b/homedecor/slopes.lua
@@ -1,5 +1,3 @@
--- Various kinds of shingles
-
 local S = homedecor.gettext
 
 local slope_cbox = {
@@ -41,9 +39,6 @@ homedecor.register_outer_corner = function(modname, subname, groups, slope_image
 		drawtype = "mesh",
 		mesh = "homedecor_slope_outer_corner.obj",
 		tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" },
-		paramtype = "light",
-		paramtype2 = "facedir",
-		walkable = true,
 		selection_box = ocorner_cbox,
 		collision_box = ocorner_cbox,
 		groups = groups,
@@ -57,10 +52,6 @@ homedecor.register_inner_corner = function(modname, subname, groups, slope_image
 		drawtype = "mesh",
 		mesh = "homedecor_slope_inner_corner.obj",
 		tiles = { "homedecor_slope_inner_corner_"..slope_image..".png" },
-		paramtype = "light",
-		paramtype2 = "facedir",
-		walkable = true,
-		selection_box = { type = "regular" },
 		collision_box = icorner_cbox,
 		groups = groups,
 		on_place = minetest.rotate_node
@@ -73,9 +64,6 @@ homedecor.register_slope = function(modname, subname, recipeitem, groups, slope_
 		drawtype = "mesh",
 		mesh = "homedecor_slope.obj",
 		tiles = { "homedecor_slope_"..slope_image..".png" },
-		paramtype = "light",
-		paramtype2 = "facedir",
-		walkable = true,
 		selection_box = slope_cbox,
 		collision_box = slope_cbox,
 		groups = groups,
@@ -248,4 +236,3 @@ homedecor.register_slope("homedecor", "glass",
 	"glass",
 	"Glass Shingles"
 )
-
diff --git a/homedecor/tables.lua b/homedecor/tables.lua
index 68aa343b..987b37b4 100644
--- a/homedecor/tables.lua
+++ b/homedecor/tables.lua
@@ -31,7 +31,6 @@ for i in ipairs(materials) do
 		tiles = { 'homedecor_'..m..'_table_small_square.png' },
 		wield_image = 'homedecor_'..m..'_table_small_square_inv.png',
 		inventory_image = 'homedecor_'..m..'_table_small_square_inv.png',
-		sunlight_propagates = true,
 		groups = { snappy = 3 },
 		sounds = s,
 		selection_box = tables_cbox,
@@ -47,7 +46,6 @@ for i in ipairs(materials) do
 		tiles = { "homedecor_"..m.."_table_small_round.png" },
 		wield_image = 'homedecor_'..m..'_table_small_round_inv.png',
 		inventory_image = 'homedecor_'..m..'_table_small_round_inv.png',
-		sunlight_propagates = true,
 		groups = { snappy = 3 },
 		sounds = s,
 		selection_box = tables_cbox,
@@ -69,7 +67,6 @@ for i in ipairs(materials) do
 		},
 		wield_image = 'homedecor_'..m..'_table_large_inv.png',
 		inventory_image = 'homedecor_'..m..'_table_large_inv.png',
-		sunlight_propagates = true,
 		groups = { snappy = 3 },
 		sounds = s,
 		node_box = {
@@ -168,7 +165,7 @@ homedecor.register("table_legs_"..t, {
 	wield_image = "homedecor_table_legs_"..t..".png",
 	walkable = false,
 	groups = {snappy=3},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	selection_box = {
 		type = "fixed",
 		fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 }
@@ -182,7 +179,6 @@ homedecor.register("utility_table_legs", {
 	tiles = { 'homedecor_utility_table_legs.png' },
 	inventory_image = 'homedecor_utility_table_legs_inv.png',
 	wield_image = 'homedecor_utility_table_legs.png',
-	sunlight_propagates = true,
 	walkable = false,
 	groups = { snappy = 3 },
 	sounds = default.node_sound_wood_defaults(),
@@ -208,6 +204,7 @@ homedecor.register("desk", {
 	inventory_image = "homedecor_desk_inv.png",
 	selection_box = desk_cbox,
 	collision_box = desk_cbox,
+	sounds = default.node_sound_wood_defaults(),
 	groups = { snappy = 3 },
 	expand = { right="air" },
 	inventory = {
@@ -216,4 +213,3 @@ homedecor.register("desk", {
 })
 
 minetest.register_alias("homedecor:desk_r", "air")
-
diff --git a/homedecor/window_treatments.lua b/homedecor/window_treatments.lua
index 637db48a..009dfb6f 100644
--- a/homedecor/window_treatments.lua
+++ b/homedecor/window_treatments.lua
@@ -82,7 +82,6 @@ homedecor.register("blinds_thick", {
 	groups = {snappy=3},
 	sounds = default.node_sound_wood_defaults(),
 	selection_box = wb1_cbox,
-	collision_box = wb1_cbox,
 })
 
 local wb2_cbox = {
@@ -102,7 +101,6 @@ homedecor.register("blinds_thin", {
 	groups = {snappy=3},
 	sounds = default.node_sound_wood_defaults(),
 	selection_box = wb2_cbox,
-	collision_box = wb2_cbox,
 })
 
 local curtaincolors = {
@@ -124,7 +122,6 @@ for c in ipairs(curtaincolors) do
 		inventory_image = "homedecor_curtain_"..color..".png",
 		wield_image = "homedecor_curtain_"..color..".png",
 		drawtype = 'signlike',
-		sunlight_propagates = true,
 		use_texture_alpha = true,
 		walkable = false,
 		groups = { snappy = 3 },
@@ -149,7 +146,6 @@ for c in ipairs(curtaincolors) do
 		inventory_image = "homedecor_curtain_open_"..color..".png",
 		wield_image = "homedecor_curtain_open_"..color..".png",
 		drawtype = 'signlike',
-		sunlight_propagates = true,
 		use_texture_alpha = true,
 		walkable = false,
 		groups = { snappy = 3 },
@@ -184,7 +180,6 @@ for i in ipairs(mats) do
 		tiles = { texture },
 		inventory_image  = "homedecor_curtainrod_"..material.."_inv.png",
 		description = "Curtain Rod ("..mat_name..")",
-		sunlight_propagates = true,
 		groups = { snappy = 3 },
 		node_box = {
 			type = "fixed",
@@ -205,6 +200,7 @@ homedecor.register("window_flowerbox", {
 		"homedecor_flowerbox_sides.png"
 	},
 	inventory_image = "homedecor_flowerbox_inv.png",
+	sounds = default.node_sound_stone_defaults(),
 	groups = { snappy = 3 },
 	node_box = {
 		type = "fixed",
diff --git a/inbox/init.lua b/inbox/init.lua
index e71531f8..0c6db754 100644
--- a/inbox/init.lua
+++ b/inbox/init.lua
@@ -1,10 +1,5 @@
 local inbox = {}
 
---[[
-TODO
-* Different node_box and texture for empty mailbox
-]]
-
 minetest.register_craft({
 	output ="inbox:empty",
 	recipe = {
@@ -108,5 +103,3 @@ function inbox.get_inbox_insert_formspec(pos)
 		"list[current_player;main;0,5;8,4;]"
 	return formspec
 end
-
-print("[Mod]Inbox Loaded!")
diff --git a/lavalamp/init.lua b/lavalamp/init.lua
index 2c796c54..8e0c3d57 100644
--- a/lavalamp/init.lua
+++ b/lavalamp/init.lua
@@ -38,6 +38,7 @@ for i in ipairs(lavalamps_list) do
 	        fixed = { -0.25, -0.5, -0.25, 0.25,0.5, 0.25 },
 	    },
 		groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+		sounds = default.node_sound_glass_defaults(),
 		on_rightclick = function(pos, node, clicker)
 	        node.name = "lavalamp:"..colour.."_off"
 	        minetest.set_node(pos, node)
@@ -61,7 +62,8 @@ for i in ipairs(lavalamps_list) do
 	        fixed = { -0.25, -0.5, -0.25, 0.25,0.5, 0.25 },
 	    },
 		groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1},
-	    drop = "lavalamp:"..colour,
+		sounds = default.node_sound_glass_defaults(),
+		drop = "lavalamp:"..colour,
 		on_rightclick = function(pos, node, clicker)
 	        node.name = "lavalamp:"..colour
 	        minetest.set_node(pos, node)
@@ -78,4 +80,3 @@ for i in ipairs(lavalamps_list) do
 	})
 	
 end
-
diff --git a/lrfurn/init.lua b/lrfurn/init.lua
index 81a765f6..416adafd 100644
--- a/lrfurn/init.lua
+++ b/lrfurn/init.lua
@@ -1,5 +1,3 @@
--- LRfurn mod by thefamilygrog66
-
 lrfurn = {}
 
 lrfurn.fdir_to_fwd = {
diff --git a/plasmascreen/init.lua b/plasmascreen/init.lua
index f013c2a0..36f5a384 100644
--- a/plasmascreen/init.lua
+++ b/plasmascreen/init.lua
@@ -1,6 +1,3 @@
---Mod adding a plasma screen television by qwrwed
-
-
 minetest.register_node("plasmascreen:stand", {
 	description = "Plasma Screen TV Stand",
 	tiles = {"plasmascreen_back.png"},