diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua
index 0fa25501..2ba41159 100644
--- a/homedecor/furniture.lua
+++ b/homedecor/furniture.lua
@@ -330,59 +330,33 @@ for _, color in ipairs(bedcolors) do
 
 end
 
-homedecor.register("wardrobe_top", {
-	tiles = {
-		"forniture_wood.png",
-		"forniture_wood.png",
-		"forniture_wood.png^[transformR90",
-		"forniture_wood.png^[transformR270",
-		"forniture_wood.png^[transformR90",
-		"homedecor_wardrobe_frontt.png"
-	},
-	groups = {snappy=3, not_in_creative_inventory=1},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5,     -0.5,   -0.4375,  0.5,      0.5,      0.5},      --  NodeBox1
-			{0.0625,   -0.4375,  -0.5,     0.4375,   0.4375,   -0.4375},  --  NodeBox2
-			{-0.4375,  -0.4375,  -0.5,     -0.0625,  0.4375,   -0.4375},  --  NodeBox3
-		}
-	},
-	selection_box = homedecor.nodebox.null,
-})
+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 = {
 		"forniture_wood.png",
-		"forniture_wood.png^[transformR180",
-		"forniture_wood.png^[transformR90",
-		"forniture_wood.png^[transformR270",
-		"forniture_wood.png^[transformR90",
-		"homedecor_wardrobe_frontb.png"
+		"homedecor_wardrobe_drawers.png",
+		"homedecor_wardrobe_doors.png"
 	},
 	inventory_image = "homedecor_wardrobe_inv.png",
 	description = "Wardrobe",
 	groups = {snappy=3},
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.5,     -0.5,     -0.4375,  0.5,  0.5,      0.5},      --  NodeBox1
-			{-0.4375,  -0.375,   -0.5,     0.4375,   -0.125,   -0.4375},  --  NodeBox2
-			{-0.4375,  -0.0625,  -0.5,     0.4375,   0.1875,   -0.4375},  --  NodeBox3
-			{-0.4375,  0.25,     -0.5,     0.4375,   0.5,      -0.4375},  --  NodeBox4
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 }
-	},
-	expand = { top="homedecor:wardrobe_top" },
+	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 = {
diff --git a/homedecor/models/homedecor_bedroom_wardrobe.obj b/homedecor/models/homedecor_bedroom_wardrobe.obj
new file mode 100644
index 00000000..833158eb
--- /dev/null
+++ b/homedecor/models/homedecor_bedroom_wardrobe.obj
@@ -0,0 +1,168 @@
+# Blender v2.73 (sub 0) OBJ File: 'bedroom-wardrobe.blend'
+# www.blender.org
+o Cylinder
+v -0.500000 -0.500000 0.500000
+v -0.500000 -0.500000 -0.437500
+v 0.500000 -0.500000 -0.437500
+v 0.500000 -0.500000 0.500000
+v -0.500000 1.500000 0.500000
+v -0.500000 1.500000 -0.437500
+v 0.500000 1.500000 -0.437500
+v 0.500000 1.500000 0.500000
+v -0.437500 0.250000 -0.437500
+v -0.437500 0.250000 -0.500000
+v 0.437500 0.250000 -0.500000
+v 0.437500 0.250000 -0.437500
+v -0.437500 0.500000 -0.437500
+v -0.437500 0.500000 -0.500000
+v 0.437500 0.500000 -0.500000
+v 0.437500 0.500000 -0.437500
+v -0.437500 -0.062500 -0.437500
+v -0.437500 -0.062500 -0.500000
+v 0.437500 -0.062500 -0.500000
+v 0.437500 -0.062500 -0.437500
+v -0.437500 0.187500 -0.437500
+v -0.437500 0.187500 -0.500000
+v 0.437500 0.187500 -0.500000
+v 0.437500 0.187500 -0.437500
+v -0.437500 -0.375000 -0.437500
+v -0.437500 -0.375000 -0.500000
+v 0.437500 -0.375000 -0.500000
+v 0.437500 -0.375000 -0.437500
+v -0.437500 -0.125000 -0.437500
+v -0.437500 -0.125000 -0.500000
+v 0.437500 -0.125000 -0.500000
+v 0.437500 -0.125000 -0.437500
+v 0.062500 0.562500 -0.437500
+v 0.062500 0.562500 -0.500000
+v 0.437500 0.562500 -0.500000
+v 0.437500 0.562500 -0.437500
+v 0.062500 1.437500 -0.437500
+v 0.062500 1.437500 -0.500000
+v 0.437500 1.437500 -0.500000
+v 0.437500 1.437500 -0.437500
+v -0.437500 0.562500 -0.437500
+v -0.437500 0.562500 -0.500000
+v -0.062500 0.562500 -0.500000
+v -0.062500 0.562500 -0.437500
+v -0.437500 1.437500 -0.437500
+v -0.437500 1.437500 -0.500000
+v -0.062500 1.437500 -0.500000
+v -0.062500 1.437500 -0.437500
+v -0.500000 1.437500 -0.437500
+v 0.500000 1.437500 -0.437500
+v -0.500000 -0.375000 -0.437500
+v 0.500000 -0.375000 -0.437500
+v -0.500000 0.500000 0.500000
+v -0.500000 0.500000 -0.437500
+v 0.500000 0.500000 -0.437500
+v 0.500000 0.500000 0.500000
+vt 1.000000 0.000000
+vt 1.000000 0.937500
+vt 0.000000 0.937500
+vt 0.000000 0.000000
+vt 0.000000 1.000000
+vt 0.062500 0.000000
+vt 0.062500 1.000000
+vt 1.000000 1.000000
+vt 0.875000 1.000000
+vt 0.875000 0.000000
+vt 0.562500 0.937500
+vt 0.562500 0.062500
+vt 0.625000 0.062500
+vt 0.625000 0.937500
+vt 0.250000 0.937500
+vt 0.250000 0.062500
+vt 0.312500 0.062500
+vt 0.312500 0.937500
+vt 0.937500 0.437500
+vt 0.937500 0.562500
+vt 0.062500 0.562500
+vt 0.062500 0.437500
+vt 0.875000 0.937500
+vt 0.875000 0.062500
+vt -0.000000 0.062500
+vt 0.062500 0.062500
+vt 1.000000 0.062500
+vt 0.062500 0.937500
+vt 0.937500 0.062500
+vt 0.937500 0.937500
+vt 0.937500 1.000000
+vt 0.937500 0.750000
+vt 1.000000 0.750000
+vt 0.062500 0.750000
+vt -0.000000 0.750000
+vt 0.062500 0.125000
+vt 0.937500 0.125000
+vt 0.937500 0.500000
+vt 1.000000 0.500000
+vt 0.062500 0.500000
+vt 0.000000 0.500000
+vt 0.937500 0.000000
+vt 0.937500 0.250000
+vt 1.000000 0.250000
+vt 0.062500 0.250000
+vt -0.000000 0.250000
+vt 0.062500 0.187500
+vt 0.937500 0.187500
+vt 0.500000 0.937500
+vt 0.437500 0.937500
+vt 0.437500 0.062500
+vt 0.500000 0.062500
+vt 0.437500 0.000000
+vt 0.437500 1.000000
+vt 0.562500 0.000000
+vt 0.562500 1.000000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+g Cylinder_Cylinder_wood
+s off
+f 53/1/1 54/2/1 2/3/1 1/4/1
+f 6/5/2 7/4/2 50/6/2 49/7/2
+f 55/3/3 56/4/3 4/1/3 3/2/3
+f 56/5/4 53/4/4 1/1/4 4/8/4
+f 1/1/5 2/2/5 3/3/5 4/4/5
+f 8/1/6 7/2/6 6/3/6 5/4/6
+f 3/1/2 2/8/2 51/9/2 52/10/2
+f 5/1/1 6/2/1 54/3/1 53/4/1
+f 7/3/3 8/4/3 56/1/3 55/2/3
+f 17/11/2 20/12/2 32/13/2 29/14/2
+f 9/15/2 12/16/2 24/17/2 21/18/2
+f 8/5/4 5/4/4 53/1/4 56/8/4
+f 33/19/2 44/20/2 48/21/2 37/22/2
+f 51/9/2 54/5/2 13/3/2 25/23/2
+f 52/10/2 28/24/2 16/25/2 55/4/2
+f 40/26/2 50/6/2 55/1/2 16/27/2
+f 45/28/2 13/2/2 54/8/2 49/7/2
+f 36/29/2 16/27/2 13/2/2 41/30/2
+g Cylinder_Cylinder_drawers
+f 13/8/1 14/31/1 10/32/1 9/33/1
+f 14/31/2 15/7/2 11/34/2 10/32/2
+f 15/7/3 16/5/3 12/35/3 11/34/3
+f 9/36/5 10/26/5 11/29/5 12/37/5
+f 16/29/6 15/37/6 14/36/6 13/26/6
+f 21/33/1 22/32/1 18/38/1 17/39/1
+f 22/32/2 23/34/2 19/40/2 18/38/2
+f 23/34/3 24/35/3 20/41/3 19/40/3
+f 17/26/5 18/6/5 19/42/5 20/29/5
+f 24/42/6 23/29/6 22/26/6 21/6/6
+f 29/39/1 30/38/1 26/43/1 25/44/1
+f 30/38/2 31/40/2 27/45/2 26/43/2
+f 31/40/3 32/41/3 28/46/3 27/45/3
+f 25/47/5 26/36/5 27/37/5 28/48/5
+f 32/37/6 31/48/6 30/47/6 29/36/6
+g Cylinder_Cylinder_doors
+f 37/49/1 38/50/1 34/51/1 33/52/1
+f 38/50/2 39/28/2 35/26/2 34/51/2
+f 39/28/3 40/3/3 36/25/3 35/26/3
+f 33/53/5 34/51/5 35/26/5 36/6/5
+f 40/7/6 39/28/6 38/50/6 37/54/6
+f 45/2/1 46/30/1 42/29/1 41/27/1
+f 46/30/2 47/11/2 43/12/2 42/29/2
+f 47/11/3 48/49/3 44/52/3 43/12/3
+f 41/42/5 42/29/5 43/12/5 44/55/5
+f 48/56/6 47/11/6 46/30/6 45/31/6
diff --git a/homedecor/textures/homedecor_wardrobe_back2.png b/homedecor/textures/homedecor_wardrobe_back2.png
deleted file mode 100644
index 59c00188..00000000
Binary files a/homedecor/textures/homedecor_wardrobe_back2.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_wardrobe_doors.png b/homedecor/textures/homedecor_wardrobe_doors.png
new file mode 100644
index 00000000..047e836f
Binary files /dev/null and b/homedecor/textures/homedecor_wardrobe_doors.png differ
diff --git a/homedecor/textures/homedecor_wardrobe_drawers.png b/homedecor/textures/homedecor_wardrobe_drawers.png
new file mode 100644
index 00000000..f96356f1
Binary files /dev/null and b/homedecor/textures/homedecor_wardrobe_drawers.png differ
diff --git a/homedecor/textures/homedecor_wardrobe_frontb.png b/homedecor/textures/homedecor_wardrobe_frontb.png
deleted file mode 100644
index 94cc3dae..00000000
Binary files a/homedecor/textures/homedecor_wardrobe_frontb.png and /dev/null differ
diff --git a/homedecor/textures/homedecor_wardrobe_frontt.png b/homedecor/textures/homedecor_wardrobe_frontt.png
deleted file mode 100644
index bc1d2e46..00000000
Binary files a/homedecor/textures/homedecor_wardrobe_frontt.png and /dev/null differ