diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua
index 5b007e8c..f1656e7a 100644
--- a/homedecor/exterior.lua
+++ b/homedecor/exterior.lua
@@ -254,77 +254,23 @@ homedecor.register("deckchair_foot", {
 	expand = { forward="homedecor:deckchair_head" },
 })
 
-homedecor.register("doghouse_base", {
+homedecor.register("doghouse", {
+	mesh = "homedecor_doghouse.obj",
 	tiles = {
-		"homedecor_doghouse_base_top.png",
-		"homedecor_doghouse_base_bottom.png",
-		"homedecor_doghouse_base_side.png",
-		"homedecor_doghouse_base_side.png",
-		"homedecor_doghouse_base_side.png",
-		"homedecor_doghouse_base_front.png"
+		"homedecor_shingles_terracotta.png",
+		"default_wood.png",
+		"building_blocks_towel.png"
 	},
 	description = "Doghouse",
 	inventory_image = "homedecor_doghouse_inv.png",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{0.3125, -0.5, -0.4375, 0.4375, -0.3125, -0.3125}, -- NodeBox1
-			{0.3125, -0.5, 0.3125, 0.4375, -0.3125, 0.4375}, -- NodeBox2
-			{-0.4375, -0.5, 0.3125, -0.3125, -0.3125, 0.4375}, -- NodeBox3
-			{-0.4375, -0.5, -0.4375, -0.3125, -0.3125, -0.3125}, -- NodeBox4
-			{-0.4375, -0.3125, -0.4375, -0.375, 0.5, 0.4375}, -- NodeBox5
-			{-0.4375, 0.3125, -0.375, 0.4375, 0.5, -0.3125}, -- NodeBox6
-			{-0.4375, -0.3125, -0.4375, 0.4375, -0.25, 0.4375}, -- NodeBox7
-			{-0.375, -0.3125, -0.375, -0.1875, 0.4375, -0.3125}, -- NodeBox8
-			{0.1875, -0.3125, -0.375, 0.4375, 0.5, -0.3125}, -- NodeBox9
-			{0.375, -0.25, -0.4375, 0.4375, 0.5, 0.4375}, -- NodeBox10
-			{-0.4375, -0.3125, 0.375, 0.4375, 0.5, 0.4375}, -- NodeBox11
-		}
-	},
 	selection_box = homedecor.nodebox.slab_y(1.5),
+	collision_box = homedecor.nodebox.slab_y(1.5),
 	groups = {snappy=3},
-	expand = { top="homedecor:doghouse_roof" },
+	expand = { top="air" },
 })
 
-homedecor.register("doghouse_roof", {
-	tiles = {
-		"homedecor_doghouse_roof_top.png",
-		"homedecor_doghouse_roof_bottom.png",
-		"homedecor_doghouse_roof_side.png",
-		"homedecor_doghouse_roof_side.png",
-		"homedecor_doghouse_roof_front.png",
-		"homedecor_doghouse_roof_front.png"
-	},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5, -0.5, -0.5, -0.4375, -0.4375, 0.5}, -- NodeBox17
-			{-0.4375, -0.4375, -0.5, -0.375, -0.375, 0.5}, -- NodeBox18
-			{-0.375, -0.375, -0.5, -0.3125, -0.3125, 0.5}, -- NodeBox19
-			{-0.3125, -0.3125, -0.5, -0.25, -0.25, 0.5}, -- NodeBox20
-			{-0.25, -0.25, -0.5, -0.1875, -0.1875, 0.5}, -- NodeBox21
-			{-0.1875, -0.1875, -0.5, -0.125, -0.125, 0.5}, -- NodeBox22
-			{-0.125, -0.125, -0.5, -0.0625, -0.0625, 0.5}, -- NodeBox23
-			{-0.0625, -0.0625, -0.5, 0.0625, 0, 0.5}, -- NodeBox24
-			{0.0625, -0.125, -0.5, 0.125, -0.0625, 0.5}, -- NodeBox25
-			{0.125, -0.1875, -0.5, 0.1875, -0.125, 0.5}, -- NodeBox26
-			{0.1875, -0.25, -0.5, 0.25, -0.1875, 0.5}, -- NodeBox27
-			{0.25, -0.3125, -0.5, 0.3125, -0.25, 0.5}, -- NodeBox28
-			{0.3125, -0.375, -0.5, 0.375, -0.3125, 0.5}, -- NodeBox29
-			{0.375, -0.4375, -0.5, 0.4375, -0.375, 0.5}, -- NodeBox30
-			{0.4375, -0.5, -0.5, 0.5, -0.4375, 0.5}, -- NodeBox31
-			{-0.4375, -0.5, -0.375, 0.4375, -0.4375, 0.4375}, -- NodeBox32
-			{-0.375, -0.4375, -0.375, 0.375, -0.375, 0.4375}, -- NodeBox33
-			{-0.3125, -0.375, -0.375, 0.3125, -0.3125, 0.4375}, -- NodeBox34
-			{-0.25, -0.3125, -0.375, 0.25, -0.25, 0.4375}, -- NodeBox35
-			{-0.1875, -0.25, -0.375, 0.1875, -0.1875, 0.4375}, -- NodeBox36
-			{-0.125, -0.1875, -0.375, 0.125, -0.125, 0.4375}, -- NodeBox37
-			{0.0625, -0.125, -0.375, -0.0625, -0.0625, 0.4375}, -- NodeBox38
-		}
-	},
-	selection_box = homedecor.nodebox.null,
-	groups = {snappy=3, not_in_creative_inventory=1},
-})
+minetest.register_alias("homedecor:doghouse_roof", "air")
+minetest.register_alias("homedecor:doghouse_base", "homedecor:doghouse")
 
 homedecor.register("simple_bench", {
 	tiles = {
diff --git a/homedecor/models/homedecor_doghouse.obj b/homedecor/models/homedecor_doghouse.obj
new file mode 100644
index 00000000..92cb3875
--- /dev/null
+++ b/homedecor/models/homedecor_doghouse.obj
@@ -0,0 +1,325 @@
+# Blender v2.73 (sub 0) OBJ File: 'doghouse.blend'
+# www.blender.org
+o shingles_Cube.004
+v 0.562500 0.437500 -0.500000
+v 0.562500 0.437500 0.500000
+v -0.562500 0.437500 0.500000
+v -0.562500 0.437500 -0.500000
+v 0.000000 1.000000 -0.500000
+v 0.000000 1.000000 0.500000
+v 0.562500 0.375000 -0.500000
+v 0.562500 0.375000 0.500000
+v -0.562500 0.375000 0.500000
+v -0.562500 0.375000 -0.500000
+v 0.000000 0.937500 -0.500000
+v 0.000000 0.937500 0.500000
+v 0.562500 0.437500 -0.500000
+v 0.562500 0.437500 0.500000
+v -0.562500 0.437500 0.500000
+v -0.562500 0.437500 -0.500000
+v 0.000000 1.000000 -0.500000
+v 0.000000 1.000000 0.500000
+v 0.562500 0.375000 -0.500000
+v 0.562500 0.375000 0.500000
+v -0.562500 0.375000 0.500000
+v -0.562500 0.375000 -0.500000
+vt 0.062500 0.312500
+vt 0.000000 0.250000
+vt 0.937500 0.250000
+vt 1.000000 0.312500
+vt 1.000000 0.000000
+vt 0.937500 0.062500
+vt 0.000000 0.062500
+vt 0.062500 0.000000
+vt 0.062500 0.437500
+vt 0.000000 0.375000
+vt 0.937500 0.375000
+vt 1.000000 0.437500
+vt 1.000000 0.125000
+vt 0.937500 0.187500
+vt 0.000000 0.187500
+vt 0.062500 0.125000
+vt 1.000000 1.000000
+vt -0.000000 1.000000
+vt 1.000000 0.062500
+vt -0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 0.000000 -1.000000
+vn 0.707100 0.707100 0.000000
+vn -0.707100 0.707100 0.000000
+vn 1.000000 0.000000 0.000000
+vn -1.000000 0.000000 0.000000
+g shingles_Cube.004_shingles
+s off
+f 3/1/1 9/2/1 12/3/1 6/4/1
+f 6/5/1 12/6/1 8/7/1 2/8/1
+f 1/9/2 7/10/2 11/11/2 5/12/2
+f 5/13/2 11/14/2 10/15/2 4/16/2
+f 17/17/3 18/18/3 14/7/3 13/19/3
+f 18/17/4 17/18/4 16/7/4 15/19/4
+f 14/7/5 20/20/5 19/5/5 13/19/5
+f 16/7/6 22/20/6 21/5/6 15/19/6
+o main-wood_Cube.002
+v -0.437500 -0.312500 0.437500
+v -0.437500 -0.312500 -0.437500
+v 0.437500 -0.312500 -0.437500
+v 0.437500 -0.312500 0.437500
+v -0.375000 -0.250000 -0.437500
+v 0.375000 -0.250000 -0.437500
+v -0.375000 -0.250000 0.375000
+v 0.375000 -0.250000 0.375000
+v 0.000000 0.875000 0.375000
+v -0.375000 0.500000 -0.312500
+v 0.375000 0.500000 -0.312500
+v 0.000000 0.875000 -0.312500
+v -0.375000 -0.250000 -0.375000
+v 0.375000 -0.250000 -0.375000
+v -0.375000 0.312500 -0.375000
+v 0.375000 0.312500 -0.375000
+v 0.375001 -0.250001 -0.312502
+v -0.374999 -0.250001 -0.312502
+v 0.187499 -0.250001 -0.312502
+v -0.187500 -0.250000 -0.375000
+v 0.187499 0.312500 -0.312501
+v 0.187500 0.312500 -0.375000
+v -0.187498 0.312500 -0.312501
+v -0.187500 0.312500 -0.375000
+v 0.187500 -0.250000 -0.375000
+v -0.187498 -0.250001 -0.312502
+v 0.562500 0.375000 -0.500000
+v 0.562500 0.375000 0.500000
+v -0.562500 0.375000 0.500000
+v -0.562500 0.375000 -0.500000
+v 0.000000 0.937500 -0.500000
+v 0.000000 0.937500 0.500000
+v -0.437500 0.500000 0.437500
+v -0.437500 0.500000 -0.437500
+v 0.437500 0.500000 -0.437500
+v 0.437500 0.500000 0.437500
+v 0.000000 0.937500 0.437500
+v -0.375000 0.562500 -0.437500
+v 0.375000 0.562500 -0.437500
+v -0.375000 0.562500 -0.375000
+v 0.375000 0.562500 -0.375000
+v 0.000000 0.937500 -0.375000
+v -0.437500 -0.500000 -0.312500
+v -0.437500 -0.500000 -0.437500
+v -0.312500 -0.500000 -0.437500
+v -0.312500 -0.500000 -0.312500
+v -0.437500 -0.312500 -0.312500
+v -0.312500 -0.312500 -0.437500
+v -0.312500 -0.312500 -0.312500
+v 0.312500 -0.500000 -0.312500
+v 0.312500 -0.500000 -0.437500
+v 0.437500 -0.500000 -0.437500
+v 0.437500 -0.500000 -0.312500
+v 0.312500 -0.312500 -0.312500
+v 0.312500 -0.312500 -0.437500
+v 0.437500 -0.312500 -0.312500
+v 0.312500 -0.500000 0.437500
+v 0.312500 -0.500000 0.312500
+v 0.437500 -0.500000 0.312500
+v 0.437500 -0.500000 0.437500
+v 0.312500 -0.312500 0.437500
+v 0.312500 -0.312500 0.312500
+v 0.437500 -0.312500 0.312500
+v -0.437500 -0.500000 0.437500
+v -0.437500 -0.500000 0.312500
+v -0.312500 -0.500000 0.312500
+v -0.312500 -0.500000 0.437500
+v -0.437500 -0.312500 0.312500
+v -0.312500 -0.312500 0.312500
+v -0.312500 -0.312500 0.437500
+v -0.375000 0.375000 -0.437500
+v -0.437500 0.375000 -0.437500
+v 0.437500 0.375000 -0.437500
+v 0.375000 0.375000 -0.437500
+v 0.437500 0.375000 0.437500
+v -0.437500 0.375000 0.437500
+v 0.375000 0.375000 -0.375000
+v -0.375000 0.375000 -0.375000
+v -0.375000 0.500000 0.375000
+v 0.375000 0.500000 0.375000
+v 0.375000 -0.312500 -0.437500
+v -0.375000 -0.312500 -0.437500
+vt 0.187500 0.062500
+vt 0.312500 0.062500
+vt 0.375000 0.125000
+vt 0.187500 0.125000
+vt 0.187500 0.875000
+vt 0.375000 0.875000
+vt 0.312500 0.937500
+vt 0.187500 0.937500
+vt 0.062500 0.937500
+vt 0.062500 0.062500
+vt 0.937500 0.062500
+vt 0.937500 0.937500
+vt 0.875000 0.125000
+vt 0.875000 0.875000
+vt 0.125000 0.875000
+vt 0.125000 0.125000
+vt 0.187500 0.187500
+vt 0.000000 0.187500
+vt 0.000000 0.062500
+vt 0.937500 0.687500
+vt 0.937500 0.875000
+vt 0.250000 0.875000
+vt 0.250000 0.687500
+vt 0.687500 0.812500
+vt 0.687500 0.875000
+vt -0.000000 0.875000
+vt -0.000000 0.812500
+vt 0.187500 0.812500
+vt -0.000000 0.937500
+vt 0.687500 1.000000
+vt -0.000000 1.000000
+vt 0.687500 0.937500
+vt 0.937500 0.125000
+vt 0.937500 0.312500
+vt 0.250000 0.312500
+vt 0.250000 0.125000
+vt 0.750000 1.000000
+vt 0.000000 -0.000000
+vt 0.750000 0.000000
+vt 0.250000 0.000000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.250000 1.000000
+vt 0.750000 0.500000
+vt 0.375000 0.375000
+vt 0.375000 0.437500
+vt 0.000000 0.437500
+vt 0.000000 0.375000
+vt 0.187500 0.625000
+vt 0.187500 0.750000
+vt -0.000000 0.750000
+vt -0.000000 0.625000
+vt 0.062500 0.187500
+vt 0.187500 0.250000
+vt 0.187500 0.375000
+vt -0.000000 0.250000
+vt 0.812500 0.187500
+vt 0.812500 0.062500
+vt 0.937500 0.187500
+vt 0.812500 0.937500
+vt 0.812500 0.812500
+vt 0.937500 0.812500
+vt 0.062500 0.812500
+vt 1.000000 0.062500
+vt 1.000000 0.937500
+vt 1.000000 0.125000
+vt 1.000000 0.875000
+vt -0.000000 0.125000
+vt 0.750000 0.125000
+vt 0.750000 0.875000
+vt 0.500000 0.937500
+vt 0.500000 0.062500
+vt 0.375000 0.500000
+vt 0.750000 0.625000
+vt 0.750000 0.562500
+vt 0.937500 0.562500
+vt 0.937500 0.625000
+vt 0.750000 0.687500
+vt 0.937500 0.750000
+vt 0.750000 0.750000
+vt 0.875000 0.000000
+vt 0.875000 0.750000
+vt 0.125000 0.750000
+vt 0.125000 -0.000000
+vt 0.000000 0.687500
+vt 0.000000 0.562500
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+vn -1.000000 0.000000 -0.000000
+vn 1.000000 0.000000 -0.000000
+vn -0.707100 -0.707100 0.000000
+vn 0.707100 -0.707100 0.000000
+vn 0.000000 0.000000 1.000000
+g main-wood_Cube.002_wood
+s off
+f 94/21/7 56/22/7 60/23/7 93/24/7
+f 96/25/7 61/26/7 57/27/7 95/28/7
+f 23/29/8 24/30/8 25/31/8 26/32/8
+f 30/33/9 28/34/9 27/35/9 29/36/9
+f 24/21/7 70/37/7 67/38/7 66/39/7
+f 44/40/7 38/41/7 36/42/7 47/43/7
+f 43/44/10 44/45/10 47/46/10 41/47/10
+f 69/48/10 24/28/10 66/49/10 65/47/10
+f 45/50/11 48/51/11 42/49/11 46/52/11
+f 37/53/7 46/54/7 42/55/7 35/56/7
+f 53/57/12 49/51/12 50/58/12 54/59/12
+f 54/60/13 51/61/13 52/62/13 53/63/13
+f 97/21/14 58/22/14 59/64/14 55/27/14 98/28/14
+f 25/48/11 78/28/11 75/49/11 74/47/11
+f 77/48/7 25/28/7 74/49/7 73/47/7
+f 44/65/8 43/66/8 45/67/8 46/68/8
+f 99/25/7 100/24/7 62/23/7 64/64/7 63/26/7
+f 70/21/11 71/37/11 68/38/11 67/39/11
+f 71/69/14 69/70/14 65/71/14 68/72/14
+f 65/73/8 66/30/8 67/21/8 68/37/8
+f 76/48/10 77/28/10 73/49/10 72/47/10
+f 78/74/14 76/75/14 72/68/14 75/76/14
+f 72/77/8 73/78/8 74/31/8 75/79/8
+f 26/21/14 83/37/14 79/38/14 82/39/14
+f 83/21/10 84/37/10 80/38/10 79/39/10
+f 84/69/7 85/70/7 81/71/7 80/72/7
+f 79/80/8 80/81/8 81/82/8 82/32/8
+f 90/74/7 91/75/7 88/68/7 87/76/7
+f 91/21/11 92/37/11 89/38/11 88/39/11
+f 86/29/8 87/83/8 88/48/8 89/28/8
+f 85/48/11 26/28/11 82/49/11 81/47/11
+f 23/21/10 90/37/10 87/38/10 86/39/10
+f 92/48/14 23/28/14 86/49/14 89/47/14
+f 26/21/14 97/84/14 98/85/14 23/28/14
+f 38/41/7 37/53/7 100/86/7 99/87/7
+f 29/88/7 101/89/7 102/90/7 30/46/7
+f 34/91/12 33/29/12 102/30/12 31/92/12
+f 32/32/13 34/91/13 31/92/13 101/31/13
+f 98/39/10 55/21/10 56/28/10 94/49/10
+f 95/39/11 57/21/11 58/28/11 97/49/11
+f 101/88/7 31/93/7 102/46/7
+f 100/94/11 93/95/11 60/96/11 62/97/11
+f 99/98/10 63/40/10 61/99/10 96/100/10
+f 102/101/10 33/102/10 39/103/10 30/104/10
+f 101/102/11 29/103/11 40/104/11 32/101/11
+f 99/98/10 96/100/10 28/71/10 36/105/10
+f 93/95/11 100/94/11 35/72/11 27/106/11
+f 25/39/11 95/84/11 97/85/11 26/49/11
+f 23/39/10 98/84/10 94/85/10 24/49/10
+f 103/25/7 104/24/7 27/56/7 28/42/7
+f 94/84/7 93/86/7 104/24/7 24/21/7
+f 95/85/7 25/28/7 103/25/7 96/87/7
+o pillow_Cube.001
+v -0.250000 -0.250000 -0.250000
+v 0.250000 -0.250000 -0.250000
+v -0.212977 -0.207031 0.212977
+v -0.212977 -0.207031 -0.212977
+v 0.212977 -0.207031 -0.212977
+v 0.212977 -0.207031 0.212977
+v -0.250000 -0.238281 0.250000
+v -0.250000 -0.238281 -0.250000
+v 0.250000 -0.238281 -0.250000
+v 0.250000 -0.238281 0.250000
+vt 0.738146 0.750000
+vt 0.738146 0.250000
+vt 0.749597 0.250000
+vt 0.749597 0.750000
+vt 0.285772 0.287023
+vt 0.701971 0.287023
+vt 0.701971 0.712977
+vt 0.285772 0.712977
+vt 0.249597 0.750000
+vt 0.249597 0.250000
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 1.000000 0.000000
+vn -0.645000 0.764200 0.000000
+vn 0.000000 0.764200 -0.645000
+vn 0.645000 0.764200 0.000000
+g pillow_Cube.001_pillow
+s off
+f 112/107/15 113/108/15 106/109/15 105/110/15
+f 110/111/16 109/112/16 108/113/16 107/114/16
+f 107/114/17 108/113/17 112/107/17 111/115/17
+f 108/113/18 109/112/18 113/108/18 112/107/18
+f 109/112/19 110/111/19 114/116/19 113/108/19
diff --git a/homedecor/textures/homedecor_doghouse_base_bottom.png b/homedecor/textures/homedecor_doghouse_base_bottom.png
deleted file mode 100644
index d6de8fe8..00000000
Binary files a/homedecor/textures/homedecor_doghouse_base_bottom.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_doghouse_base_front.png b/homedecor/textures/homedecor_doghouse_base_front.png
deleted file mode 100644
index 0efe9478..00000000
Binary files a/homedecor/textures/homedecor_doghouse_base_front.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_doghouse_base_side.png b/homedecor/textures/homedecor_doghouse_base_side.png
deleted file mode 100644
index 9d36035e..00000000
Binary files a/homedecor/textures/homedecor_doghouse_base_side.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_doghouse_base_top.png b/homedecor/textures/homedecor_doghouse_base_top.png
deleted file mode 100644
index dcf75c94..00000000
Binary files a/homedecor/textures/homedecor_doghouse_base_top.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_doghouse_inv.png b/homedecor/textures/homedecor_doghouse_inv.png
index 89301817..a3511f3f 100644
Binary files a/homedecor/textures/homedecor_doghouse_inv.png and b/homedecor/textures/homedecor_doghouse_inv.png differ
diff --git a/homedecor/textures/homedecor_doghouse_roof_bottom.png b/homedecor/textures/homedecor_doghouse_roof_bottom.png
deleted file mode 100644
index 4091ec04..00000000
Binary files a/homedecor/textures/homedecor_doghouse_roof_bottom.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_doghouse_roof_front.png b/homedecor/textures/homedecor_doghouse_roof_front.png
deleted file mode 100644
index fa1bf1ed..00000000
Binary files a/homedecor/textures/homedecor_doghouse_roof_front.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_doghouse_roof_side.png b/homedecor/textures/homedecor_doghouse_roof_side.png
deleted file mode 100644
index 078c8b94..00000000
Binary files a/homedecor/textures/homedecor_doghouse_roof_side.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_doghouse_roof_top.png b/homedecor/textures/homedecor_doghouse_roof_top.png
deleted file mode 100644
index a230904d..00000000
Binary files a/homedecor/textures/homedecor_doghouse_roof_top.png and /dev/null differ