diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua
index 7254959a..59406370 100644
--- a/homedecor/clocks.lua
+++ b/homedecor/clocks.lua
@@ -14,14 +14,23 @@ local clock_sbox = {
 	fixed = { -8/32, -8/32, 14/32, 8/32, 8/32, 16/32 }
 }
 
-local materials = {"plastic", "wood"}
+local clock_materials = {
+	{ "plastic", "homedecor_generic_plastic_white.png" },
+	{ "wood", "default_wood.png" }
+}
 
-for _, m in ipairs(materials) do
-	homedecor.register("analog_clock_"..m, {
-		description = "Analog clock ("..m..")",
+for i in ipairs(clock_materials) do
+	local m1 = clock_materials[i][1]
+	local m2 = clock_materials[i][2]
+	homedecor.register("analog_clock_"..m1, {
+		description = "Analog clock ("..m1..")",
 		mesh = "homedecor_analog_clock.obj",
-		tiles = { "homedecor_analog_clock_"..m..".png" },
-		inventory_image = "homedecor_analog_clock_"..m.."_inv.png",
+		tiles = {
+			"homedecor_analog_clock_face.png",
+			m2,
+			"homedecor_analog_clock_back.png"
+		},
+		inventory_image = "homedecor_analog_clock_"..m1.."_inv.png",
 		collision_box = clock_cbox,
 		selection_box = clock_sbox,
 		groups = {snappy=3},
diff --git a/homedecor/models/homedecor_analog_clock.obj b/homedecor/models/homedecor_analog_clock.obj
index cd5a4556..e1ed1b25 100644
--- a/homedecor/models/homedecor_analog_clock.obj
+++ b/homedecor/models/homedecor_analog_clock.obj
@@ -1,240 +1,507 @@
-# Blender v2.69 (sub 0) OBJ File: 'analog_clock.blend'
+# Blender v2.73 (sub 0) OBJ File: 'analog_clock.blend'
 # www.blender.org
-mtllib homedecor_analog_clock.mtl
 o Cylinder
 v 0.000000 -0.250000 0.500000
-v 0.000000 -0.250000 0.437500
+v 0.000000 -0.250000 0.453125
 v 0.048773 -0.245196 0.500000
-v 0.048773 -0.245196 0.437500
+v 0.048773 -0.245196 0.453125
 v 0.095671 -0.230970 0.500000
-v 0.095671 -0.230970 0.437500
+v 0.095671 -0.230970 0.453125
 v 0.138893 -0.207867 0.500000
-v 0.138893 -0.207867 0.437500
+v 0.138893 -0.207867 0.453125
 v 0.176777 -0.176777 0.500000
-v 0.176777 -0.176777 0.437500
+v 0.176777 -0.176777 0.453125
 v 0.207867 -0.138893 0.500000
-v 0.207867 -0.138893 0.437500
+v 0.207867 -0.138893 0.453125
 v 0.230970 -0.095671 0.500000
-v 0.230970 -0.095671 0.437500
+v 0.230970 -0.095671 0.453125
 v 0.245196 -0.048773 0.500000
-v 0.245196 -0.048773 0.437500
+v 0.245196 -0.048773 0.453125
 v 0.250000 -0.000000 0.500000
-v 0.250000 -0.000000 0.437500
+v 0.250000 -0.000000 0.453125
 v 0.245196 0.048773 0.500000
-v 0.245196 0.048773 0.437500
+v 0.245196 0.048773 0.453125
 v 0.230970 0.095671 0.500000
-v 0.230970 0.095671 0.437500
+v 0.230970 0.095671 0.453125
 v 0.207867 0.138893 0.500000
-v 0.207867 0.138893 0.437500
+v 0.207867 0.138893 0.453125
 v 0.176777 0.176777 0.500000
-v 0.176777 0.176777 0.437500
+v 0.176777 0.176777 0.453125
 v 0.138893 0.207867 0.500000
-v 0.138893 0.207867 0.437500
+v 0.138893 0.207867 0.453125
 v 0.095671 0.230970 0.500000
-v 0.095671 0.230970 0.437500
+v 0.095671 0.230970 0.453125
 v 0.048773 0.245196 0.500000
-v 0.048773 0.245196 0.437500
+v 0.048773 0.245196 0.453125
 v -0.000000 0.250000 0.500000
-v -0.000000 0.250000 0.437500
+v -0.000000 0.250000 0.453125
 v -0.048773 0.245196 0.500000
-v -0.048773 0.245196 0.437500
+v -0.048773 0.245196 0.453125
 v -0.095671 0.230970 0.500000
-v -0.095671 0.230970 0.437500
+v -0.095671 0.230970 0.453125
 v -0.138893 0.207867 0.500000
-v -0.138893 0.207867 0.437500
+v -0.138893 0.207867 0.453125
 v -0.176777 0.176777 0.500000
-v -0.176777 0.176777 0.437500
+v -0.176777 0.176777 0.453125
 v -0.207868 0.138892 0.500000
-v -0.207868 0.138892 0.437500
+v -0.207868 0.138892 0.453125
 v -0.230970 0.095671 0.500000
-v -0.230970 0.095671 0.437500
+v -0.230970 0.095671 0.453125
 v -0.245196 0.048772 0.500000
-v -0.245196 0.048772 0.437500
+v -0.245196 0.048772 0.453125
 v -0.250000 -0.000000 0.500000
-v -0.250000 -0.000000 0.437500
+v -0.250000 -0.000000 0.453125
 v -0.245196 -0.048773 0.500000
-v -0.245196 -0.048773 0.437500
+v -0.245196 -0.048773 0.453125
 v -0.230970 -0.095671 0.500000
-v -0.230970 -0.095671 0.437500
+v -0.230970 -0.095671 0.453125
 v -0.207867 -0.138893 0.500000
-v -0.207867 -0.138893 0.437500
+v -0.207867 -0.138893 0.453125
 v -0.176776 -0.176777 0.500000
-v -0.176776 -0.176777 0.437500
+v -0.176776 -0.176777 0.453125
 v -0.138892 -0.207868 0.500000
-v -0.138892 -0.207868 0.437500
+v -0.138892 -0.207868 0.453125
 v -0.095671 -0.230970 0.500000
-v -0.095671 -0.230970 0.437500
+v -0.095671 -0.230970 0.453125
 v -0.048772 -0.245196 0.500000
-v -0.048772 -0.245196 0.437500
-vt 0.277778 0.194444
-vt 0.277778 0.166667
-vt 0.333333 0.166667
-vt 0.333333 0.194444
-vt 0.388889 0.166667
-vt 0.388889 0.194444
-vt 0.444444 0.166667
-vt 0.444444 0.194444
-vt 0.500000 0.166667
-vt 0.500000 0.194444
-vt 0.555556 0.166667
-vt 0.555556 0.194444
-vt 0.611111 0.166667
-vt 0.611111 0.194444
-vt 0.666667 0.166667
-vt 0.666667 0.194444
-vt 0.722222 0.166667
-vt 0.722222 0.194444
-vt 0.277778 0.444444
-vt 0.277778 0.416667
-vt 0.333333 0.416667
-vt 0.333333 0.444444
-vt 0.388889 0.416667
-vt 0.388889 0.444444
-vt 0.444444 0.416667
-vt 0.444444 0.444444
-vt 0.500000 0.416667
-vt 0.500000 0.444444
-vt 0.555556 0.416667
-vt 0.555556 0.444444
-vt 0.611111 0.416667
-vt 0.611111 0.444444
-vt 0.666667 0.416667
-vt 0.666667 0.444444
-vt 0.722222 0.416667
-vt 0.722222 0.444444
-vt 0.277778 0.361111
-vt 0.277778 0.333333
-vt 0.333333 0.333333
-vt 0.333333 0.361111
-vt 0.388889 0.333333
-vt 0.388889 0.361111
-vt 0.444444 0.333333
-vt 0.444444 0.361111
-vt 0.500000 0.333333
-vt 0.500000 0.361111
-vt 0.555556 0.333333
-vt 0.555556 0.361111
-vt 0.611111 0.333333
-vt 0.611111 0.361111
-vt 0.666667 0.333333
-vt 0.666667 0.361111
-vt 0.722222 0.333333
-vt 0.722222 0.361111
-vt 0.277778 0.277778
-vt 0.277778 0.250000
-vt 0.333333 0.250000
-vt 0.333333 0.277778
-vt 0.388889 0.250000
-vt 0.388889 0.277778
-vt 0.444444 0.250000
-vt 0.444444 0.277778
+v -0.048772 -0.245196 0.453125
+v 0.125000 0.125000 0.500000
+v -0.125000 0.125000 0.500000
+v 0.125000 -0.125000 0.500000
+v -0.125000 -0.125000 0.500000
+v -0.000000 0.000000 0.437500
+v 0.041457 -0.208417 0.437500
+v -0.000000 -0.212500 0.437500
+v -0.041456 -0.208417 0.437500
+v -0.081320 -0.196324 0.437500
+v -0.118058 -0.176687 0.437500
+v -0.150260 -0.150260 0.437500
+v -0.176687 -0.118059 0.437500
+v -0.196324 -0.081320 0.437500
+v -0.208417 -0.041457 0.437500
+v -0.212500 -0.000000 0.437500
+v -0.208417 0.041457 0.437500
+v -0.196324 0.081320 0.437500
+v -0.176687 0.118059 0.437500
+v -0.150260 0.150260 0.437500
+v -0.118059 0.176687 0.437500
+v -0.081320 0.196324 0.437500
+v -0.041457 0.208417 0.437500
+v -0.000000 0.212500 0.437500
+v 0.041457 0.208417 0.437500
+v 0.081320 0.196324 0.437500
+v 0.118059 0.176687 0.437500
+v 0.150260 0.150260 0.437500
+v 0.176687 0.118059 0.437500
+v 0.196324 0.081320 0.437500
+v 0.208417 0.041457 0.437500
+v 0.212500 0.000000 0.437500
+v 0.208417 -0.041457 0.437500
+v 0.196324 -0.081320 0.437500
+v 0.176687 -0.118059 0.437500
+v 0.150260 -0.150260 0.437500
+v 0.118059 -0.176687 0.437500
+v 0.081320 -0.196324 0.437500
+vt 0.402455 0.009607
+vt 0.500000 0.000000
+vt 0.500000 0.500000
+vt 0.597545 0.009607
+vt 0.691341 0.038060
+vt 0.777785 0.084265
+vt 0.853553 0.146446
+vt 0.915734 0.222214
+vt 0.961940 0.308658
+vt 0.990393 0.402454
+vt 1.000000 0.499999
+vt 0.990393 0.597545
+vt 0.961940 0.691341
+vt 0.915735 0.777785
+vt 0.853554 0.853553
+vt 0.777785 0.915735
+vt 0.691342 0.961940
+vt 0.597545 0.990393
+vt 0.500000 1.000000
+vt 0.402455 0.990393
+vt 0.308658 0.961940
+vt 0.222215 0.915735
+vt 0.146447 0.853553
+vt 0.084265 0.777785
+vt 0.038060 0.691342
+vt 0.009607 0.597545
+vt 0.000000 0.500000
+vt 0.009607 0.402455
+vt 0.038060 0.308658
+vt 0.084265 0.222215
+vt 0.146447 0.146447
+vt 0.222215 0.084265
+vt 0.308658 0.038060
+vt 0.500000 0.625000
+vt 0.562500 0.500000
+vt 0.562500 0.625000
+vt 0.625000 0.500000
+vt 0.625000 0.625000
+vt 0.687500 0.500000
+vt 0.687500 0.625000
+vt 0.750000 0.500000
+vt 0.750000 0.625000
+vt 0.812500 0.500000
+vt 0.812500 0.625000
+vt 0.875000 0.500000
+vt 0.875000 0.625000
+vt 0.937500 0.500000
+vt 0.937500 0.625000
+vt 1.000000 0.625000
+vt 0.000000 0.937500
+vt 0.000000 0.812500
+vt 0.062500 0.812500
+vt 0.062500 0.937500
+vt 0.125000 0.812500
+vt 0.125000 0.937500
+vt 0.187500 0.812500
+vt 0.187500 0.937500
+vt 0.250000 0.812500
+vt 0.250000 0.937500
+vt 0.312500 0.812500
+vt 0.312500 0.937500
+vt 0.375000 0.812500
+vt 0.375000 0.937500
+vt 0.437500 0.812500
+vt 0.437500 0.937500
+vt 0.500000 0.812500
+vt 0.500000 0.937500
+vt 0.562500 0.812500
+vt 0.562500 0.937500
+vt 0.625000 0.812500
+vt 0.625000 0.937500
+vt 0.687500 0.812500
+vt 0.687500 0.937500
+vt 0.750000 0.812500
+vt 0.750000 0.937500
+vt 0.812500 0.812500
+vt 0.812500 0.937500
+vt 0.875000 0.812500
+vt 0.875000 0.937500
+vt 0.937500 0.812500
+vt 0.937500 0.937500
+vt 1.000000 0.812500
+vt 1.000000 0.937500
+vt 0.000000 0.625000
+vt 0.062500 0.500000
+vt 0.062500 0.625000
+vt 0.125000 0.500000
+vt 0.125000 0.625000
+vt 0.187500 0.500000
+vt 0.187500 0.625000
+vt 0.250000 0.500000
+vt 0.250000 0.625000
+vt 0.312500 0.500000
+vt 0.312500 0.625000
+vt 0.375000 0.500000
+vt 0.375000 0.625000
+vt 0.875000 0.250000
+vt 0.937500 0.250000
+vt 0.937500 0.375000
+vt 0.875000 0.375000
+vt 0.437500 0.625000
+vt 0.437500 0.500000
+vt 0.750000 0.250000
+vt 0.812500 0.250000
+vt 0.812500 0.375000
+vt 0.750000 0.375000
+vt 0.687500 0.250000
+vt 0.687500 0.375000
+vt 0.625000 0.250000
+vt 0.625000 0.375000
+vt 0.562500 0.250000
+vt 0.562500 0.375000
 vt 0.500000 0.250000
-vt 0.500000 0.277778
-vt 0.555556 0.250000
-vt 0.555556 0.277778
-vt 0.611111 0.250000
-vt 0.611111 0.277778
-vt 0.205810 0.528444
-vt 0.249900 0.524101
-vt 0.293990 0.528444
-vt 0.336386 0.541304
-vt 0.375457 0.562189
-vt 0.409704 0.590294
-vt 0.437811 0.624542
-vt 0.458695 0.663614
-vt 0.471556 0.706010
-vt 0.475898 0.750100
-vt 0.471556 0.794190
-vt 0.458695 0.836585
-vt 0.437811 0.875658
-vt 0.409705 0.909905
-vt 0.375458 0.938011
-vt 0.336386 0.958895
-vt 0.293990 0.971756
-vt 0.249900 0.976098
-vt 0.205810 0.971756
-vt 0.163414 0.958895
-vt 0.124342 0.938010
-vt 0.090095 0.909905
-vt 0.061989 0.875658
-vt 0.041105 0.836586
-vt 0.028244 0.794190
-vt 0.023902 0.750100
-vt 0.028244 0.706010
-vt 0.041105 0.663614
-vt 0.061989 0.624542
-vt 0.090095 0.590295
-vt 0.124342 0.562189
-vt 0.163414 0.541304
-vt 0.666667 0.277778
-vt 0.666667 0.250000
-vt 0.722222 0.250000
-vt 0.722222 0.277778
-vt 0.750099 0.524102
-vt 0.794189 0.528444
-vt 0.836585 0.541305
-vt 0.875658 0.562189
-vt 0.909904 0.590295
-vt 0.938010 0.624542
-vt 0.958895 0.663614
-vt 0.971756 0.706010
-vt 0.976098 0.750100
-vt 0.971756 0.794190
-vt 0.958895 0.836586
-vt 0.938011 0.875658
-vt 0.909905 0.909905
-vt 0.875658 0.938011
-vt 0.836586 0.958895
-vt 0.794190 0.971755
-vt 0.750100 0.976098
-vt 0.706009 0.971755
-vt 0.663613 0.958894
-vt 0.624541 0.938010
-vt 0.590294 0.909904
-vt 0.562188 0.875656
-vt 0.541304 0.836583
-vt 0.528444 0.794188
-vt 0.524101 0.750098
-vt 0.528444 0.706008
-vt 0.541305 0.663613
-vt 0.562189 0.624541
-vt 0.590295 0.590295
-vt 0.624542 0.562189
-vt 0.663614 0.541305
-vt 0.706010 0.528444
-usemtl None
+vt 0.500000 0.375000
+vt 0.437500 0.250000
+vt 0.437500 0.375000
+vt 0.375000 0.250000
+vt 0.375000 0.375000
+vt 0.312500 0.250000
+vt 0.312500 0.375000
+vt 0.250000 0.250000
+vt 0.250000 0.375000
+vt 0.187500 0.250000
+vt 0.187500 0.375000
+vt 0.125000 0.250000
+vt 0.125000 0.375000
+vt 0.062500 0.250000
+vt 0.062500 0.375000
+vt -0.000000 0.250000
+vt -0.000000 0.375000
+vt 0.937500 -0.000000
+vt 1.000000 -0.000000
+vt 1.000000 0.125000
+vt 0.937500 0.125000
+vt 0.875000 -0.000000
+vt 0.875000 0.125000
+vt 0.812500 -0.000000
+vt 0.812500 0.125000
+vt 0.750000 -0.000000
+vt 0.750000 0.125000
+vt 0.687500 -0.000000
+vt 0.687500 0.125000
+vt 0.625000 -0.000000
+vt 0.625000 0.125000
+vt 0.562500 -0.000000
+vt 0.562500 0.125000
+vt 0.500000 0.125000
+vt 0.437500 -0.000000
+vt 0.437500 0.125000
+vt 0.375000 -0.000000
+vt 0.375000 0.125000
+vt 0.312500 -0.000000
+vt 0.312500 0.125000
+vt 0.250000 -0.000000
+vt 0.250000 0.125000
+vt 0.187500 -0.000000
+vt 0.187500 0.125000
+vt 0.125000 -0.000000
+vt 0.125000 0.125000
+vt 0.062500 -0.000000
+vt 0.062500 0.125000
+vt -0.000000 -0.000000
+vt -0.000000 0.125000
+vt 1.000000 0.250000
+vt 1.000000 0.375000
+vt 0.750000 0.750000
+vt 0.250000 0.750000
+vn 0.040500 -0.203800 -0.978100
+vn 0.000000 -0.207800 -0.978100
+vn 0.000000 0.000000 -1.000000
+vn -0.040500 -0.203800 -0.978100
+vn -0.079500 -0.192000 -0.978100
+vn -0.115500 -0.172800 -0.978100
+vn -0.146900 -0.146900 -0.978100
+vn -0.172800 -0.115500 -0.978100
+vn -0.192000 -0.079500 -0.978100
+vn -0.203800 -0.040500 -0.978100
+vn -0.207800 0.000000 -0.978100
+vn -0.203800 0.040500 -0.978100
+vn -0.192000 0.079500 -0.978100
+vn -0.172800 0.115500 -0.978100
+vn -0.146900 0.146900 -0.978100
+vn -0.115500 0.172800 -0.978100
+vn -0.079500 0.192000 -0.978100
+vn -0.040500 0.203800 -0.978100
+vn 0.000000 0.207800 -0.978100
+vn 0.040500 0.203800 -0.978100
+vn 0.079500 0.192000 -0.978100
+vn 0.115500 0.172800 -0.978100
+vn 0.146900 0.146900 -0.978100
+vn 0.172800 0.115500 -0.978100
+vn 0.192000 0.079500 -0.978100
+vn 0.203800 0.040500 -0.978100
+vn 0.207800 0.000000 -0.978100
+vn 0.203800 -0.040500 -0.978100
+vn 0.192000 -0.079500 -0.978100
+vn 0.172800 -0.115500 -0.978100
+vn 0.146900 -0.146900 -0.978100
+vn 0.115500 -0.172800 -0.978100
+vn 0.079500 -0.192000 -0.978100
+vn 0.000000 -0.727900 0.685700
+vn 0.000000 -0.842100 -0.539300
+vn 0.164300 -0.825900 -0.539300
+vn 0.142000 -0.713900 0.685700
+vn 0.322200 -0.778000 -0.539300
+vn 0.278500 -0.672500 0.685700
+vn 0.467800 -0.700200 -0.539300
+vn 0.404400 -0.605200 0.685700
+vn 0.595400 -0.595400 -0.539300
+vn 0.514700 -0.514700 0.685700
+vn 0.700200 -0.467800 -0.539300
+vn 0.605200 -0.404400 0.685700
+vn 0.778000 -0.322200 -0.539300
+vn 0.672500 -0.278500 0.685700
+vn 0.825900 -0.164300 -0.539300
+vn 0.713900 -0.142000 0.685700
+vn 0.842100 0.000000 -0.539300
+vn 0.727900 0.000000 0.685700
+vn 0.825900 0.164300 -0.539300
+vn 0.713900 0.142000 0.685700
+vn 0.778000 0.322200 -0.539300
+vn 0.672500 0.278500 0.685700
+vn 0.700200 0.467800 -0.539300
+vn 0.605200 0.404400 0.685700
+vn 0.595400 0.595400 -0.539300
+vn 0.514700 0.514700 0.685700
+vn 0.467800 0.700200 -0.539300
+vn 0.404400 0.605200 0.685700
+vn 0.322200 0.778000 -0.539300
+vn 0.278500 0.672500 0.685700
+vn 0.164300 0.825900 -0.539300
+vn 0.142000 0.713900 0.685700
+vn 0.000000 0.842100 -0.539300
+vn 0.000000 0.727900 0.685700
+vn -0.164300 0.825900 -0.539300
+vn -0.142000 0.713900 0.685700
+vn -0.322200 0.778000 -0.539300
+vn -0.278500 0.672500 0.685700
+vn -0.467800 0.700200 -0.539300
+vn -0.404400 0.605200 0.685700
+vn -0.595400 0.595400 -0.539300
+vn -0.514700 0.514700 0.685700
+vn -0.700200 0.467800 -0.539300
+vn -0.605200 0.404400 0.685700
+vn -0.778000 0.322200 -0.539300
+vn -0.672500 0.278500 0.685700
+vn -0.825900 0.164300 -0.539300
+vn -0.713900 0.142000 0.685700
+vn -0.842100 0.000000 -0.539300
+vn -0.727900 0.000000 0.685700
+vn -0.825900 -0.164300 -0.539300
+vn -0.713900 -0.142000 0.685700
+vn -0.778000 -0.322200 -0.539300
+vn -0.672500 -0.278500 0.685700
+vn -0.700200 -0.467800 -0.539300
+vn -0.605200 -0.404400 0.685700
+vn -0.595400 -0.595400 -0.539300
+vn -0.514700 -0.514700 0.685700
+vn -0.467800 -0.700200 -0.539300
+vn -0.404400 -0.605200 0.685700
+vn -0.322200 -0.778000 -0.539300
+vn -0.278500 -0.672500 0.685700
+vn -0.142000 -0.713900 0.685700
+vn -0.164300 -0.825900 -0.539300
+vn 0.000000 -0.000000 1.000000
+g Cylinder_Cylinder_face
+s 1
+f 70/1/1 71/2/2 69/3/3
+f 71/2/2 72/4/4 69/3/3
+f 72/4/4 73/5/5 69/3/3
+f 73/5/5 74/6/6 69/3/3
+f 74/6/6 75/7/7 69/3/3
+f 75/7/7 76/8/8 69/3/3
+f 76/8/8 77/9/9 69/3/3
+f 77/9/9 78/10/10 69/3/3
+f 78/10/10 79/11/11 69/3/3
+f 79/11/11 80/12/12 69/3/3
+f 80/12/12 81/13/13 69/3/3
+f 81/13/13 82/14/14 69/3/3
+f 82/14/14 83/15/15 69/3/3
+f 83/15/15 84/16/16 69/3/3
+f 84/16/16 85/17/17 69/3/3
+f 85/17/17 86/18/18 69/3/3
+f 86/18/18 87/19/19 69/3/3
+f 87/19/19 88/20/20 69/3/3
+f 88/20/20 89/21/21 69/3/3
+f 89/21/21 90/22/22 69/3/3
+f 90/22/22 91/23/23 69/3/3
+f 91/23/23 92/24/24 69/3/3
+f 92/24/24 93/25/25 69/3/3
+f 93/25/25 94/26/26 69/3/3
+f 94/26/26 95/27/27 69/3/3
+f 95/27/27 96/28/28 69/3/3
+f 96/28/28 97/29/29 69/3/3
+f 97/29/29 98/30/30 69/3/3
+f 98/30/30 99/31/31 69/3/3
+f 99/31/31 100/32/32 69/3/3
+f 100/32/32 101/33/33 69/3/3
+f 101/33/33 70/1/1 69/3/3
+g Cylinder_Cylinder_sides-etc
+f 1/34/34 2/3/35 4/35/36 3/36/37
+f 3/36/37 4/35/36 6/37/38 5/38/39
+f 5/38/39 6/37/38 8/39/40 7/40/41
+f 7/40/41 8/39/40 10/41/42 9/42/43
+f 9/42/43 10/41/42 12/43/44 11/44/45
+f 11/44/45 12/43/44 14/45/46 13/46/47
+f 13/46/47 14/45/46 16/47/48 15/48/49
+f 15/48/49 16/47/48 18/11/50 17/49/51
+f 17/50/51 18/51/50 20/52/52 19/53/53
+f 19/53/53 20/52/52 22/54/54 21/55/55
+f 21/55/55 22/54/54 24/56/56 23/57/57
+f 23/57/57 24/56/56 26/58/58 25/59/59
+f 25/59/59 26/58/58 28/60/60 27/61/61
+f 27/61/61 28/60/60 30/62/62 29/63/63
+f 29/63/63 30/62/62 32/64/64 31/65/65
+f 31/65/65 32/64/64 34/66/66 33/67/67
+f 33/67/67 34/66/66 36/68/68 35/69/69
+f 35/69/69 36/68/68 38/70/70 37/71/71
+f 37/71/71 38/70/70 40/72/72 39/73/73
+f 39/73/73 40/72/72 42/74/74 41/75/75
+f 41/75/75 42/74/74 44/76/76 43/77/77
+f 43/77/77 44/76/76 46/78/78 45/79/79
+f 45/79/79 46/78/78 48/80/80 47/81/81
+f 47/81/81 48/80/80 50/82/82 49/83/83
+f 49/84/83 50/27/82 52/85/84 51/86/85
+f 51/86/85 52/85/84 54/87/86 53/88/87
+f 53/88/87 54/87/86 56/89/88 55/90/89
+f 55/90/89 56/89/88 58/91/90 57/92/91
+f 57/92/91 58/91/90 60/93/92 59/94/93
+f 59/94/93 60/93/92 62/95/94 61/96/95
+f 6/97/38 4/98/36 70/99/1 101/100/33
+f 63/101/96 64/102/97 2/3/35 1/34/34
+f 61/96/95 62/95/94 64/102/97 63/101/96
+f 9/7/43 11/8/45 67/103/98
+f 8/104/40 6/97/38 101/100/33 100/105/32
+f 10/103/42 8/104/40 100/105/32 99/106/31
+f 12/107/44 10/103/42 99/106/31 98/108/30
+f 14/109/46 12/107/44 98/108/30 97/110/29
+f 16/111/48 14/109/46 97/110/29 96/112/28
+f 18/113/50 16/111/48 96/112/28 95/114/27
+f 20/115/52 18/113/50 95/114/27 94/116/26
+f 22/117/54 20/115/52 94/116/26 93/118/25
+f 24/119/56 22/117/54 93/118/25 92/120/24
+f 26/121/58 24/119/56 92/120/24 91/122/23
+f 28/123/60 26/121/58 91/122/23 90/124/22
+f 30/125/62 28/123/60 90/124/22 89/126/21
+f 32/127/64 30/125/62 89/126/21 88/128/20
+f 34/129/66 32/127/64 88/128/20 87/130/19
+f 36/131/68 34/132/66 87/133/19 86/134/18
+f 38/135/70 36/131/68 86/134/18 85/136/17
+f 40/137/72 38/135/70 85/136/17 84/138/16
+f 42/139/74 40/137/72 84/138/16 83/140/15
+f 44/141/76 42/139/74 83/140/15 82/142/14
+f 46/143/78 44/141/76 82/142/14 81/144/13
+f 48/145/80 46/143/78 81/144/13 80/146/12
+f 50/2/82 48/145/80 80/146/12 79/147/11
+f 52/148/84 50/2/82 79/147/11 78/149/10
+f 54/150/86 52/148/84 78/149/10 77/151/9
+f 56/152/88 54/150/86 77/151/9 76/153/8
+f 58/154/90 56/152/88 76/153/8 75/155/7
+f 60/156/92 58/154/90 75/155/7 74/157/6
+f 62/158/94 60/156/92 74/157/6 73/159/5
+f 64/160/97 62/158/94 73/159/5 72/161/4
+f 2/162/35 64/160/97 72/161/4 71/163/2
+f 4/98/36 2/164/35 71/165/2 70/99/1
+f 9/7/43 67/103/98 7/6/41
+f 25/15/59 27/16/61 65/166/98
+f 25/15/59 65/166/98 23/14/57
+f 57/31/91 59/32/93 68/121/98
+f 57/31/91 68/121/98 55/30/89
+f 39/22/73 41/23/75 66/167/98
+f 43/24/77 66/167/98 41/23/75
+f 11/8/45 13/9/47 67/103/98
+f 7/6/41 67/103/98 5/5/39
+f 59/32/93 61/33/95 68/121/98
+f 55/30/89 68/121/98 53/29/87
+f 39/22/73 66/167/98 37/21/71
+f 45/25/79 66/167/98 43/24/77
+f 27/16/61 29/17/63 65/166/98
+f 23/14/57 65/166/98 21/13/55
+f 15/10/49 67/103/98 13/9/47
+f 17/11/51 67/103/98 15/10/49
+f 21/13/55 65/166/98 19/12/53
+f 19/12/53 65/166/98 17/11/51
+f 67/103/98 17/11/51 65/166/98
+f 5/5/39 67/103/98 3/4/37
+f 3/4/37 67/103/98 1/2/34
+f 63/1/96 68/121/98 61/33/95
+f 1/2/34 68/121/98 63/1/96
+f 68/121/98 1/2/34 67/103/98
+f 53/29/87 68/121/98 51/28/85
+f 51/28/85 68/121/98 49/27/83
+f 68/121/98 66/167/98 49/27/83
+f 49/27/83 66/167/98 47/26/81
+f 47/26/81 66/167/98 45/25/79
+f 31/18/65 65/166/98 29/17/63
+f 33/19/67 65/166/98 31/18/65
+f 33/19/67 35/20/69 66/167/98
+f 37/21/71 66/167/98 35/20/69
+f 65/166/98 33/19/67 66/167/98
+g Cylinder_Cylinder_back
 s off
-f 1/1 2/2 4/3 3/4
-f 3/4 4/3 6/5 5/6
-f 5/6 6/5 8/7 7/8
-f 7/8 8/7 10/9 9/10
-f 9/10 10/9 12/11 11/12
-f 11/12 12/11 14/13 13/14
-f 13/14 14/13 16/15 15/16
-f 15/16 16/15 18/17 17/18
-f 17/19 18/20 20/21 19/22
-f 19/22 20/21 22/23 21/24
-f 21/24 22/23 24/25 23/26
-f 23/26 24/25 26/27 25/28
-f 25/28 26/27 28/29 27/30
-f 27/30 28/29 30/31 29/32
-f 29/32 30/31 32/33 31/34
-f 31/34 32/33 34/35 33/36
-f 33/37 34/38 36/39 35/40
-f 35/40 36/39 38/41 37/42
-f 37/42 38/41 40/43 39/44
-f 39/44 40/43 42/45 41/46
-f 41/46 42/45 44/47 43/48
-f 43/48 44/47 46/49 45/50
-f 45/50 46/49 48/51 47/52
-f 47/52 48/51 50/53 49/54
-f 49/55 50/56 52/57 51/58
-f 51/58 52/57 54/59 53/60
-f 53/60 54/59 56/61 55/62
-f 55/62 56/61 58/63 57/64
-f 57/64 58/63 60/65 59/66
-f 59/66 60/65 62/67 61/68
-f 4/69 2/70 64/71 62/72 60/73 58/74 56/75 54/76 52/77 50/78 48/79 46/80 44/81 42/82 40/83 38/84 36/85 34/86 32/87 30/88 28/89 26/90 24/91 22/92 20/93 18/94 16/95 14/96 12/97 10/98 8/99 6/100
-f 63/101 64/102 2/103 1/104
-f 61/68 62/67 64/102 63/101
-f 1/105 3/106 5/107 7/108 9/109 11/110 13/111 15/112 17/113 19/114 21/115 23/116 25/117 27/118 29/119 31/120 33/121 35/122 37/123 39/124 41/125 43/126 45/127 47/128 49/129 51/130 53/131 55/132 57/133 59/134 61/135 63/136
+f 65/166/98 66/167/98 68/121/98 67/103/98
diff --git a/homedecor/textures/homedecor_analog_clock_back.png b/homedecor/textures/homedecor_analog_clock_back.png
new file mode 100644
index 00000000..5101ea3b
Binary files /dev/null and b/homedecor/textures/homedecor_analog_clock_back.png differ
diff --git a/homedecor/textures/homedecor_analog_clock_face.png b/homedecor/textures/homedecor_analog_clock_face.png
new file mode 100644
index 00000000..1952d98e
Binary files /dev/null and b/homedecor/textures/homedecor_analog_clock_face.png differ
diff --git a/homedecor/textures/homedecor_analog_clock_plastic.png b/homedecor/textures/homedecor_analog_clock_plastic.png
deleted file mode 100644
index f8c12e31..00000000
Binary files a/homedecor/textures/homedecor_analog_clock_plastic.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_analog_clock_plastic_inv.png b/homedecor/textures/homedecor_analog_clock_plastic_inv.png
index 73f90db7..dccf1a56 100644
Binary files a/homedecor/textures/homedecor_analog_clock_plastic_inv.png and b/homedecor/textures/homedecor_analog_clock_plastic_inv.png differ
diff --git a/homedecor/textures/homedecor_analog_clock_wood.png b/homedecor/textures/homedecor_analog_clock_wood.png
deleted file mode 100644
index d7a91caf..00000000
Binary files a/homedecor/textures/homedecor_analog_clock_wood.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_analog_clock_wood_inv.png b/homedecor/textures/homedecor_analog_clock_wood_inv.png
index 251a549f..1aaf995f 100644
Binary files a/homedecor/textures/homedecor_analog_clock_wood_inv.png and b/homedecor/textures/homedecor_analog_clock_wood_inv.png differ
diff --git a/homedecor/textures/homedecor_generic_plastic_white.png b/homedecor/textures/homedecor_generic_plastic_white.png
new file mode 100644
index 00000000..df946a74
Binary files /dev/null and b/homedecor/textures/homedecor_generic_plastic_white.png differ