diff --git a/lavalamp/init.lua b/lavalamp/init.lua
index c1fb485a..165ef355 100644
--- a/lavalamp/init.lua
+++ b/lavalamp/init.lua
@@ -13,39 +13,22 @@ for i in ipairs(lavalamps_list) do
 
 	minetest.register_node("lavalamp:"..colour, {
 	    description = lavalampdesc,
-	    drawtype = "nodebox",
+		drawtype = "mesh",
+		mesh = "lavalamp.obj",
 	    tiles = {
-	        "lavalamp_lamp_top.png",
-	        "lavalamp_lamp_bottom.png",
+	        "lavalamp_metal.png",
 	        {
 	            name="lavalamp_lamp_anim_"..colour..".png",
 	            animation={
 	                type="vertical_frames",
 	                aspect_w=40,
 	                aspect_h=40,
-	                length=3.0,
+	                length=6.0,
 	            },
 	        },
 	    },    
 	    paramtype = "light",
 	    paramtype2 = "facedir",
-	    node_box = {
-	        type = "fixed",
-	        fixed = {        
-				-- base
-	            { -0.1875, -0.5,  -0.1875,  0.1875, -0.3125,  0.1875, },
-	            { -0.125, -0.5,  -0.25,  0.125, -0.3125,  -0.1875, },
-	            { -0.25, -0.5,  -0.125,  -0.1875, -0.3125,  0.125, },
-	            { 0.1875, -0.5,  -0.125,  0.25, -0.3125,  0.125, },
-	            { -0.125, -0.5,  0.1875,  0.125, -0.3125,  0.25, },          
-	            -- lamp
-	            { -0.125, -0.3125,  -0.125,  0.125,  0.5,  0.125, },
-	            { -0.0625,  -0.3125,  -0.1875,  0.0625,  0.5,  -0.125, },
-	            { -0.0625,  -0.3125,  0.125,  0.0625,  0.5,  0.1875, },	 
-	            { -0.1875,  -0.3125,  -0.0625,  0.125,  0.5,  0.0625, },
-	            { 0.125,  -0.3125,  -0.0625,  0.1875,  0.5,  0.0625, },	           			
-	        },
-	    },
 	    sunlight_propagates = true,
 	    walkable = false,
 	    light_source = 14,
@@ -62,31 +45,14 @@ for i in ipairs(lavalamps_list) do
 
 	minetest.register_node("lavalamp:"..colour.."_off", {
 	    description = lavalampdesc.." off",
-	    drawtype = "nodebox",
+	    drawtype = "mesh",
+		mesh = "lavalamp.obj",
 	    tiles = {
-	        "lavalamp_lamp_top.png",
-	        "lavalamp_lamp_bottom.png",
-	        "lavalamp_lamp_off_sides.png",
+	        "lavalamp_metal.png",
+	        "lavalamp_lamp_off.png",
 	    },	    
 	    paramtype = "light",
 	    paramtype2 = "facedir",
-	    node_box = {
-	        type = "fixed",
-			fixed = {        
-				-- base
-	            { -0.1875, -0.5,  -0.1875,  0.1875, -0.3125,  0.1875, },
-	            { -0.125, -0.5,  -0.25,  0.125, -0.3125,  -0.1875, },
-	            { -0.25, -0.5,  -0.125,  -0.1875, -0.3125,  0.125, },
-	            { 0.1875, -0.5,  -0.125,  0.25, -0.3125,  0.125, },
-	            { -0.125, -0.5,  0.1875,  0.125, -0.3125,  0.25, },          
-	            -- lamp
-	            { -0.125, -0.3125,  -0.125,  0.125,  0.5,  0.125, },
-	            { -0.0625,  -0.3125,  -0.1875,  0.0625,  0.5,  -0.125, },
-	            { -0.0625,  -0.3125,  0.125,  0.0625,  0.5,  0.1875, },	 
-	            { -0.1875,  -0.3125,  -0.0625,  0.125,  0.5,  0.0625, },
-	            { 0.125,  -0.3125,  -0.0625,  0.1875,  0.5,  0.0625, },	           			
-	        },
-	    },
 	    sunlight_propagates = true,
 	    walkable = false,
 	    selection_box = {
diff --git a/lavalamp/models/lavalamp.obj b/lavalamp/models/lavalamp.obj
new file mode 100644
index 00000000..321ea748
--- /dev/null
+++ b/lavalamp/models/lavalamp.obj
@@ -0,0 +1,550 @@
+# Blender v2.73 (sub 0) OBJ File: 'lava-lamp.blend'
+# www.blender.org
+o Cylinder
+v 0.017236 0.500000 -0.017236
+v 0.106066 -0.500000 -0.106066
+v 0.009328 0.500000 -0.022520
+v 0.057403 -0.500000 -0.138582
+v 0.000000 0.500000 -0.024375
+v 0.000000 -0.500000 -0.150000
+v 0.057403 0.000000 -0.138582
+v 0.000000 0.000000 -0.150000
+v 0.138582 -0.500000 -0.057403
+v 0.022520 0.500000 -0.009328
+v 0.150000 -0.500000 0.000000
+v 0.024375 0.500000 -0.000000
+v 0.138582 -0.500000 0.057403
+v 0.022520 0.500000 0.009328
+v 0.106066 -0.500000 0.106066
+v 0.017236 0.500000 0.017236
+v 0.057403 -0.500000 0.138582
+v 0.009328 0.500000 0.022520
+v 0.000000 -0.500000 0.150000
+v 0.000000 0.500000 0.024375
+v -0.057402 -0.500000 0.138582
+v -0.009328 0.500000 0.022520
+v -0.106066 -0.500000 0.106066
+v -0.017236 0.500000 0.017236
+v -0.138582 -0.500000 0.057403
+v -0.022520 0.500000 0.009328
+v -0.150000 -0.500000 -0.000000
+v -0.024375 0.500000 -0.000000
+v -0.138582 -0.500000 -0.057403
+v -0.022520 0.500000 -0.009328
+v -0.106066 -0.500000 -0.106066
+v -0.017236 0.500000 -0.017236
+v -0.057402 -0.500000 -0.138582
+v -0.009328 0.500000 -0.022520
+v 0.106066 0.000000 -0.106066
+v 0.138582 0.000000 -0.057403
+v 0.150000 0.000000 0.000000
+v 0.138582 0.000000 0.057403
+v 0.106066 0.000000 0.106066
+v 0.057403 0.000000 0.138582
+v 0.000000 0.000000 0.150000
+v -0.057402 0.000000 0.138582
+v -0.106066 0.000000 0.106066
+v -0.138582 0.000000 0.057403
+v -0.150000 0.000000 -0.000000
+v -0.138582 0.000000 -0.057403
+v -0.106066 0.000000 -0.106066
+v -0.057402 0.000000 -0.138582
+v 0.032145 -0.250000 -0.077606
+v 0.059397 -0.250000 -0.059397
+v 0.077606 -0.250000 -0.032145
+v 0.084000 -0.250000 0.000000
+v 0.077606 -0.250000 0.032145
+v 0.059397 -0.250000 0.059397
+v 0.032145 -0.250000 0.077606
+v 0.000000 -0.250000 0.084000
+v -0.032145 -0.250000 0.077606
+v -0.059397 -0.250000 0.059397
+v -0.077606 -0.250000 0.032145
+v -0.084000 -0.250000 -0.000000
+v -0.077606 -0.250000 -0.032145
+v -0.059397 -0.250000 -0.059397
+v 0.000000 -0.250000 -0.084000
+v -0.032145 -0.250000 -0.077606
+v -0.124724 0.125000 -0.051662
+v -0.095459 0.125000 -0.095459
+v 0.000000 0.375000 -0.059400
+v 0.045922 -0.375000 -0.110866
+v -0.051662 0.125000 -0.124724
+v 0.084853 -0.375000 -0.084853
+v -0.135000 0.125000 -0.000000
+v 0.110866 -0.375000 -0.045922
+v -0.124724 0.125000 0.051662
+v 0.120000 -0.375000 0.000000
+v -0.095459 0.125000 0.095459
+v 0.110866 -0.375000 0.045922
+v -0.051662 0.125000 0.124724
+v 0.084853 -0.375000 0.084853
+v 0.000000 0.125000 0.135000
+v 0.045922 -0.375000 0.110866
+v 0.051662 0.125000 0.124724
+v 0.000000 -0.375000 0.120000
+v 0.095459 0.125000 0.095459
+v -0.045922 -0.375000 0.110866
+v 0.124724 0.125000 0.051662
+v -0.084853 -0.375000 0.084853
+v 0.135000 0.125000 0.000000
+v -0.110866 -0.375000 0.045922
+v 0.124724 0.125000 -0.051662
+v -0.120000 -0.375000 -0.000000
+v 0.095459 0.125000 -0.095459
+v -0.110866 -0.375000 -0.045922
+v 0.051662 0.125000 -0.124724
+v -0.084853 -0.375000 -0.084853
+v 0.000000 -0.125000 -0.150000
+v -0.045922 -0.375000 -0.110866
+v -0.054878 0.375000 -0.022731
+v -0.042002 0.375000 -0.042002
+v 0.000000 0.125000 -0.135000
+v 0.057403 -0.125000 -0.138582
+v -0.022731 0.375000 -0.054878
+v 0.106066 -0.125000 -0.106066
+v -0.059400 0.375000 -0.000000
+v 0.138582 -0.125000 -0.057403
+v -0.054878 0.375000 0.022731
+v 0.150000 -0.125000 0.000000
+v -0.042002 0.375000 0.042002
+v 0.138582 -0.125000 0.057403
+v -0.022731 0.375000 0.054878
+v 0.106066 -0.125000 0.106066
+v 0.000000 0.375000 0.059400
+v 0.057403 -0.125000 0.138582
+v 0.022731 0.375000 0.054878
+v 0.000000 -0.125000 0.150000
+v 0.042002 0.375000 0.042002
+v -0.057402 -0.125000 0.138582
+v 0.054878 0.375000 0.022731
+v -0.106066 -0.125000 0.106066
+v 0.059400 0.375000 0.000000
+v -0.138582 -0.125000 0.057403
+v 0.054878 0.375000 -0.022731
+v -0.150000 -0.125000 -0.000000
+v 0.042002 0.375000 -0.042002
+v -0.138582 -0.125000 -0.057403
+v 0.022731 0.375000 -0.054878
+v -0.106066 -0.125000 -0.106066
+v 0.000000 -0.375000 -0.120000
+v -0.057402 -0.125000 -0.138582
+vt 0.875000 0.062500
+vt 0.750000 0.062500
+vt 0.750000 0.000000
+vt 0.875000 0.000000
+vt 0.125000 0.937500
+vt 0.000000 0.937500
+vt 0.000000 0.875000
+vt 0.125000 0.875000
+vt 0.000000 0.812500
+vt 0.125000 0.812500
+vt 0.000000 0.750000
+vt 0.125000 0.750000
+vt 0.875000 1.000000
+vt 0.750000 1.000000
+vt 0.750000 0.937500
+vt 0.875000 0.937500
+vt 0.000000 0.687500
+vt 0.125000 0.687500
+vt 0.000000 0.625000
+vt 0.125000 0.625000
+vt 0.875000 0.875000
+vt 0.750000 0.875000
+vt 0.750000 0.812500
+vt 0.875000 0.812500
+vt 0.000000 0.562500
+vt 0.125000 0.562500
+vt 0.000000 0.500000
+vt 0.125000 0.500000
+vt 0.000000 0.437500
+vt 0.125000 0.437500
+vt 0.750000 0.750000
+vt 0.875000 0.750000
+vt 0.000000 0.375000
+vt 0.125000 0.375000
+vt 0.000000 0.312500
+vt 0.125000 0.312500
+vt 0.000000 0.250000
+vt 0.125000 0.250000
+vt 0.000000 0.187500
+vt 0.125000 0.187500
+vt 0.875000 0.625000
+vt 0.750000 0.625000
+vt 0.750000 0.562500
+vt 0.875000 0.562500
+vt 0.000000 0.125000
+vt 0.125000 0.125000
+vt 0.000000 0.062500
+vt 0.125000 0.062500
+vt 0.125000 1.000000
+vt 0.000000 1.000000
+vt 0.625000 0.625000
+vt 0.720671 0.605970
+vt 0.801777 0.551777
+vt 0.855970 0.470671
+vt 0.875000 0.375000
+vt 0.855970 0.279329
+vt 0.801777 0.198223
+vt 0.720671 0.144030
+vt 0.625000 0.125000
+vt 0.529329 0.144030
+vt 0.448223 0.198223
+vt 0.394030 0.279329
+vt 0.375000 0.375000
+vt 0.394030 0.470671
+vt 0.448223 0.551777
+vt 0.529329 0.605970
+vt 0.000000 0.000000
+vt 0.125000 0.000000
+vt 0.875000 0.125000
+vt 0.750000 0.125000
+vt 0.250000 0.875000
+vt 0.297836 0.865485
+vt 0.338388 0.838388
+vt 0.365485 0.797835
+vt 0.375000 0.750000
+vt 0.365485 0.702165
+vt 0.338388 0.661612
+vt 0.297836 0.634515
+vt 0.250000 0.625000
+vt 0.202164 0.634515
+vt 0.161612 0.661612
+vt 0.134515 0.702165
+vt 0.134515 0.797835
+vt 0.161612 0.838388
+vt 0.202164 0.865485
+vt 0.875000 0.187500
+vt 0.750000 0.187500
+vt 0.875000 0.250000
+vt 0.750000 0.250000
+vt 0.875000 0.312500
+vt 0.750000 0.312500
+vt 0.750000 0.375000
+vt 0.875000 0.437500
+vt 0.750000 0.437500
+vt 0.875000 0.500000
+vt 0.750000 0.500000
+vt 0.875000 0.687500
+vt 0.750000 0.687500
+vt 1.000000 0.750000
+vt 1.000000 0.687500
+vt 1.000000 0.625000
+vt 1.000000 0.562500
+vt 1.000000 0.500000
+vt 1.000000 0.437500
+vt 1.000000 0.375000
+vt 1.000000 0.312500
+vt 1.000000 0.250000
+vt 1.000000 0.187500
+vt 1.000000 0.125000
+vt 1.000000 0.062500
+vt 0.625000 0.562500
+vt 0.625000 0.812500
+vt 0.625000 0.750000
+vt 0.625000 0.937500
+vt 0.625000 0.875000
+vt 0.625000 1.000000
+vt 0.625000 0.062500
+vt 0.625000 0.000000
+vt 1.000000 0.812500
+vt 0.625000 0.187500
+vt 1.000000 0.937500
+vt 1.000000 0.875000
+vt 0.625000 0.250000
+vt 0.625000 0.312500
+vt 0.625000 0.375000
+vt 0.625000 0.437500
+vt 1.000000 1.000000
+vt 0.625000 0.500000
+vt 0.625000 0.687500
+vt 1.000000 0.000000
+vt 0.250000 -0.000000
+vt 0.250000 0.250000
+vt 0.375000 0.250000
+vt 0.375000 -0.000000
+vt 0.500000 0.250000
+vt 0.500000 -0.000000
+vt 0.500000 1.000000
+vt 0.500000 0.500000
+vt 0.375000 1.000000
+vt 0.375000 0.500000
+vt 0.250000 1.000000
+vt 0.250000 0.500000
+vn -0.967100 0.254400 0.000000
+vn -0.994200 -0.107600 0.000000
+vn -0.918500 -0.107600 -0.380400
+vn -0.893500 0.254400 -0.370100
+vn 0.000000 0.269800 -0.962900
+vn 0.000000 0.761600 -0.648000
+vn 0.248000 0.761600 -0.598700
+vn 0.368500 0.269800 -0.889600
+vn 0.458200 0.761600 -0.458200
+vn 0.680900 0.269800 -0.680900
+vn 0.598700 0.761600 -0.248000
+vn 0.889600 0.269800 -0.368500
+vn -0.703000 -0.107600 -0.703000
+vn -0.683800 0.254400 -0.683800
+vn 0.648000 0.761600 0.000000
+vn 0.962900 0.269800 0.000000
+vn 0.598700 0.761600 0.248000
+vn 0.889600 0.269800 0.368500
+vn -0.370100 0.254400 -0.893500
+vn -0.380400 -0.107600 -0.918500
+vn 0.000000 -0.107600 -0.994200
+vn 0.000000 0.254400 -0.967100
+vn 0.458200 0.761600 0.458200
+vn 0.680900 0.269800 0.680900
+vn 0.248000 0.761600 0.598700
+vn 0.368500 0.269800 0.889600
+vn 0.000000 0.761600 0.648000
+vn 0.000000 0.269800 0.962900
+vn 0.380400 -0.107600 -0.918500
+vn 0.370100 0.254400 -0.893500
+vn -0.248000 0.761600 0.598700
+vn -0.368500 0.269800 0.889600
+vn -0.458200 0.761600 0.458200
+vn -0.680900 0.269800 0.680900
+vn -0.598700 0.761600 0.248000
+vn -0.889600 0.269800 0.368500
+vn -0.648000 0.761600 0.000000
+vn -0.962900 0.269800 -0.000000
+vn 0.893500 0.254400 -0.370100
+vn 0.918500 -0.107600 -0.380400
+vn 0.994200 -0.107600 0.000000
+vn 0.967100 0.254400 0.000000
+vn -0.598700 0.761600 -0.248000
+vn -0.889600 0.269800 -0.368500
+vn -0.458200 0.761600 -0.458200
+vn -0.680900 0.269800 -0.680900
+vn -0.368500 0.269800 -0.889600
+vn -0.248000 0.761600 -0.598700
+vn 0.312900 -0.575600 -0.755500
+vn 0.578200 -0.575600 -0.578200
+vn 0.755500 -0.575600 -0.312900
+vn 0.817700 -0.575600 0.000000
+vn 0.755500 -0.575600 0.312900
+vn 0.578200 -0.575600 0.578200
+vn 0.312900 -0.575600 0.755500
+vn 0.000000 -0.575600 0.817700
+vn -0.312900 -0.575600 0.755500
+vn -0.578200 -0.575600 0.578200
+vn -0.755500 -0.575600 0.312900
+vn -0.817700 -0.575600 0.000000
+vn -0.755500 -0.575600 -0.312900
+vn -0.578200 -0.575600 -0.578200
+vn -0.312900 -0.575600 -0.755500
+vn 0.000000 -0.575600 -0.817700
+vn -0.893500 0.254400 0.370100
+vn -0.918500 -0.107600 0.380400
+vn -0.683800 0.254400 0.683800
+vn -0.703000 -0.107600 0.703000
+vn -0.370100 0.254400 0.893500
+vn -0.380400 -0.107600 0.918500
+vn 0.000000 0.254400 0.967100
+vn 0.000000 -0.107600 0.994200
+vn 0.370100 0.254400 0.893500
+vn 0.380400 -0.107600 0.918500
+vn 0.683800 0.254400 0.683800
+vn 0.703000 -0.107600 0.703000
+vn 0.893500 0.254400 0.370100
+vn 0.918500 -0.107600 0.380400
+vn 0.683800 0.254400 -0.683800
+vn 0.703000 -0.107600 -0.703000
+vn 0.817000 -0.466900 -0.338400
+vn 0.884300 -0.466900 0.000000
+vn 0.000000 -0.466900 -0.884300
+vn 0.338400 -0.466900 -0.817000
+vn -0.625300 -0.466900 -0.625300
+vn -0.338400 -0.466900 -0.817000
+vn -0.817000 -0.466900 -0.338400
+vn -0.884300 -0.466900 -0.000000
+vn -0.817000 -0.466900 0.338400
+vn -0.625300 -0.466900 0.625300
+vn -0.338400 -0.466900 0.817000
+vn 0.000000 -0.466900 0.884300
+vn 0.338400 -0.466900 0.817000
+vn 0.625300 -0.466900 0.625300
+vn 0.817000 -0.466900 0.338400
+vn 0.625300 -0.466900 -0.625300
+vn 0.000000 0.289500 0.957200
+vn -0.366300 0.289500 0.884300
+vn -0.374700 0.202900 0.904600
+vn 0.000000 0.202900 0.979200
+vn 0.382700 0.000000 -0.923900
+vn 0.382000 0.059200 -0.922200
+vn 0.705900 0.059200 -0.705900
+vn 0.707100 0.000000 -0.707100
+vn 0.922200 0.059200 -0.382000
+vn 0.923900 0.000000 -0.382700
+vn 1.000000 0.000000 0.000000
+vn 0.998200 0.059200 0.000000
+vn 0.922200 0.059200 0.382000
+vn 0.923900 0.000000 0.382700
+vn -0.676800 0.289500 0.676800
+vn -0.692400 0.202900 0.692400
+vn 0.705900 0.059200 0.705900
+vn 0.707100 0.000000 0.707100
+vn 0.382000 0.059200 0.922200
+vn 0.382700 0.000000 0.923900
+vn -0.884300 0.289500 0.366300
+vn -0.904600 0.202900 0.374700
+vn 0.000000 0.059200 0.998200
+vn 0.000000 0.000000 1.000000
+vn -0.382000 0.059200 0.922200
+vn -0.382700 0.000000 0.923900
+vn -0.957200 0.289500 -0.000000
+vn -0.979200 0.202900 0.000000
+vn -0.705900 0.059200 0.705900
+vn -0.707100 0.000000 0.707100
+vn -0.922200 0.059200 0.382000
+vn -0.923900 0.000000 0.382700
+vn -0.998200 0.059200 0.000000
+vn -1.000000 0.000000 -0.000000
+vn -0.884300 0.289500 -0.366300
+vn -0.904600 0.202900 -0.374700
+vn -0.922200 0.059200 -0.382000
+vn -0.923900 0.000000 -0.382700
+vn -0.676800 0.289500 -0.676800
+vn -0.692400 0.202900 -0.692400
+vn -0.705900 0.059200 -0.705900
+vn -0.707100 0.000000 -0.707100
+vn -0.366300 0.289500 -0.884300
+vn 0.000000 0.289500 -0.957200
+vn 0.000000 0.202900 -0.979200
+vn -0.374700 0.202900 -0.904600
+vn -0.382700 0.000000 -0.923900
+vn -0.382000 0.059200 -0.922200
+vn 0.000000 0.059200 -0.998200
+vn 0.000000 0.000000 -1.000000
+vn 0.366300 0.289500 0.884300
+vn 0.374700 0.202900 0.904600
+vn 0.676800 0.289500 0.676800
+vn 0.692400 0.202900 0.692400
+vn 0.884300 0.289500 0.366300
+vn 0.904600 0.202900 0.374700
+vn 0.957200 0.289500 0.000000
+vn 0.979200 0.202900 0.000000
+vn 0.884300 0.289500 -0.366300
+vn 0.904600 0.202900 -0.374700
+vn 0.676800 0.289500 -0.676800
+vn 0.692400 0.202900 -0.692400
+vn 0.366300 0.289500 -0.884300
+vn 0.374700 0.202900 -0.904600
+g Cylinder_Cylinder_metal
+s 1
+f 90/1/1 60/2/2 61/3/3 92/4/4
+f 67/5/5 5/6/6 3/7/7 125/8/8
+f 125/8/8 3/7/7 1/9/9 123/10/10
+f 123/10/10 1/9/9 10/11/11 121/12/12
+f 92/13/4 61/14/3 62/15/13 94/16/14
+f 121/12/12 10/11/11 12/17/15 119/18/16
+f 119/18/16 12/17/15 14/19/17 117/20/18
+f 96/21/19 64/22/20 63/23/21 127/24/22
+f 117/20/18 14/19/17 16/25/23 115/26/24
+f 115/26/24 16/25/23 18/27/25 113/28/26
+f 94/16/14 62/15/13 64/22/20 96/21/19
+f 113/28/26 18/27/25 20/29/27 111/30/28
+f 127/24/22 63/23/21 49/31/29 68/32/30
+f 111/30/28 20/29/27 22/33/31 109/34/32
+f 109/34/32 22/33/31 24/35/33 107/36/34
+f 107/36/34 24/35/33 26/37/35 105/38/36
+f 105/38/36 26/37/35 28/39/37 103/40/38
+f 72/41/39 51/42/40 52/43/41 74/44/42
+f 103/40/38 28/39/37 30/45/43 97/46/44
+f 97/46/44 30/45/43 32/47/45 98/48/46
+f 101/49/47 34/50/48 5/6/6 67/5/5
+f 4/51/49 2/52/50 9/53/51 11/54/52 13/55/53 15/56/54 17/57/55 19/58/56 21/59/57 23/60/58 25/61/59 27/62/60 29/63/61 31/64/62 33/65/63 6/66/64
+f 98/48/46 32/47/45 34/67/48 101/68/47
+f 88/69/65 59/70/66 60/2/2 90/1/1
+f 1/71/9 3/72/7 5/73/6 34/74/48 32/75/45 30/76/43 28/77/37 26/78/35 24/79/33 22/80/31 20/81/27 18/82/25 16/12/23 14/83/17 12/84/15 10/85/11
+f 86/86/67 58/87/68 59/70/66 88/69/65
+f 84/88/69 57/89/70 58/87/68 86/86/67
+f 82/90/71 56/91/72 57/89/70 84/88/69
+f 80/55/73 55/92/74 56/91/72 82/90/71
+f 78/93/75 54/94/76 55/92/74 80/55/73
+f 76/95/77 53/96/78 54/94/76 78/93/75
+f 74/44/42 52/43/41 53/96/78 76/95/77
+f 70/97/79 50/98/80 51/42/40 72/41/39
+f 68/32/30 49/31/29 50/98/80 70/97/79
+f 4/99/49 68/32/30 70/97/79 2/100/50
+f 2/100/50 70/97/79 72/41/39 9/101/51
+f 11/102/52 74/44/42 76/95/77 13/103/53
+f 13/103/53 76/95/77 78/93/75 15/104/54
+f 15/104/54 78/93/75 80/55/73 17/105/55
+f 17/105/55 80/55/73 82/90/71 19/106/56
+f 19/106/56 82/90/71 84/88/69 21/107/57
+f 21/107/57 84/88/69 86/86/67 23/108/58
+f 23/108/58 86/86/67 88/69/65 25/109/59
+f 25/109/59 88/69/65 90/1/1 27/110/60
+f 51/42/40 104/51/81 106/111/82 52/43/41
+f 63/23/21 95/112/83 100/113/84 49/31/29
+f 62/15/13 126/114/85 128/115/86 64/22/20
+f 9/101/51 72/41/39 74/44/42 11/102/52
+f 64/22/20 128/115/86 95/112/83 63/23/21
+f 61/14/3 124/116/87 126/114/85 62/15/13
+f 60/2/2 122/117/88 124/118/87 61/3/3
+f 59/70/66 120/59/89 122/117/88 60/2/2
+f 6/119/64 127/24/22 68/32/30 4/99/49
+f 58/87/68 118/120/90 120/59/89 59/70/66
+f 31/121/62 94/16/14 96/21/19 33/122/63
+f 57/89/70 116/123/91 118/120/90 58/87/68
+f 56/91/72 114/124/92 116/123/91 57/89/70
+f 33/122/63 96/21/19 127/24/22 6/119/64
+f 55/92/74 112/125/93 114/124/92 56/91/72
+f 54/94/76 110/126/94 112/125/93 55/92/74
+f 29/127/61 92/13/4 94/16/14 31/121/62
+f 53/96/78 108/128/95 110/126/94 54/94/76
+f 52/43/41 106/111/82 108/128/95 53/96/78
+f 50/98/80 102/129/96 104/51/81 51/42/40
+f 49/31/29 100/113/84 102/129/96 50/98/80
+f 27/110/60 90/1/1 92/4/4 29/130/61
+g Cylinder_Cylinder_glass
+f 111/13/97 109/14/98 77/96/99 79/95/100
+f 100/131/101 7/132/102 35/133/103 102/134/104
+f 102/134/104 35/133/103 36/135/105 104/136/106
+f 106/118/107 37/123/108 38/89/109 108/3/110
+f 109/14/98 107/116/111 75/128/112 77/96/99
+f 108/3/110 38/89/109 39/88/113 110/4/114
+f 110/4/114 39/88/113 40/107/115 112/130/116
+f 107/116/111 105/137/117 73/138/118 75/128/112
+f 112/130/116 40/107/115 41/88/119 114/4/120
+f 114/4/120 41/88/119 42/89/121 116/3/122
+f 105/137/117 103/139/123 71/140/124 73/138/118
+f 116/3/122 42/89/121 43/123/125 118/118/126
+f 118/118/126 43/123/125 44/135/127 120/136/128
+f 120/136/128 44/135/127 45/133/129 122/134/130
+f 103/139/123 97/141/131 65/142/132 71/140/124
+f 122/134/130 45/133/129 46/132/133 124/131/134
+f 97/141/131 98/49/135 66/28/136 65/142/132
+f 124/131/134 46/132/133 47/38/137 126/68/138
+f 101/50/139 67/49/140 99/28/141 69/27/142
+f 128/67/143 48/37/144 8/38/145 95/68/146
+f 126/68/138 47/38/137 48/37/144 128/67/143
+f 95/68/146 8/38/145 7/132/102 100/131/101
+f 104/136/106 36/135/105 37/123/108 106/118/107
+f 113/127/147 111/13/97 79/95/100 81/103/148
+f 115/13/149 113/127/147 81/103/148 83/95/150
+f 117/14/151 115/13/149 83/95/150 85/96/152
+f 119/116/153 117/14/151 85/96/152 87/128/154
+f 121/137/155 119/116/153 87/128/154 89/138/156
+f 123/139/157 121/137/155 89/138/156 91/140/158
+f 125/141/159 123/139/157 91/140/158 93/142/160
+f 99/28/141 67/49/140 125/141/159 93/142/160
+f 8/38/145 99/28/141 93/142/160 7/132/102
+f 7/132/102 93/142/160 91/140/158 35/133/103
+f 35/133/103 91/140/158 89/138/156 36/135/105
+f 36/135/105 89/138/156 87/128/154 37/123/108
+f 37/123/108 87/128/154 85/96/152 38/89/109
+f 38/89/109 85/96/152 83/95/150 39/88/113
+f 39/88/113 83/95/150 81/103/148 40/107/115
+f 40/107/115 81/103/148 79/95/100 41/88/119
+f 41/88/119 79/95/100 77/96/99 42/89/121
+f 47/38/137 66/28/136 69/27/142 48/37/144
+f 48/37/144 69/27/142 99/28/141 8/38/145
+f 46/132/133 65/142/132 66/28/136 47/38/137
+f 45/133/129 71/140/124 65/142/132 46/132/133
+f 44/135/127 73/138/118 71/140/124 45/133/129
+f 43/123/125 75/128/112 73/138/118 44/135/127
+f 42/89/121 77/96/99 75/128/112 43/123/125
+f 98/49/135 101/50/139 69/27/142 66/28/136
diff --git a/lavalamp/textures/lavalamp_lamp_anim_blue.png b/lavalamp/textures/lavalamp_lamp_anim_blue.png
index 03f0a657..ddf416db 100644
Binary files a/lavalamp/textures/lavalamp_lamp_anim_blue.png and b/lavalamp/textures/lavalamp_lamp_anim_blue.png differ
diff --git a/lavalamp/textures/lavalamp_lamp_anim_green.png b/lavalamp/textures/lavalamp_lamp_anim_green.png
index 80542b73..44b6c54f 100644
Binary files a/lavalamp/textures/lavalamp_lamp_anim_green.png and b/lavalamp/textures/lavalamp_lamp_anim_green.png differ
diff --git a/lavalamp/textures/lavalamp_lamp_anim_orange.png b/lavalamp/textures/lavalamp_lamp_anim_orange.png
index 23ebac3e..e5927f8b 100644
Binary files a/lavalamp/textures/lavalamp_lamp_anim_orange.png and b/lavalamp/textures/lavalamp_lamp_anim_orange.png differ
diff --git a/lavalamp/textures/lavalamp_lamp_anim_red.png b/lavalamp/textures/lavalamp_lamp_anim_red.png
index dc3c25dc..97de2a34 100644
Binary files a/lavalamp/textures/lavalamp_lamp_anim_red.png and b/lavalamp/textures/lavalamp_lamp_anim_red.png differ
diff --git a/lavalamp/textures/lavalamp_lamp_anim_violet.png b/lavalamp/textures/lavalamp_lamp_anim_violet.png
index 0ce98768..e0d99f9c 100644
Binary files a/lavalamp/textures/lavalamp_lamp_anim_violet.png and b/lavalamp/textures/lavalamp_lamp_anim_violet.png differ
diff --git a/lavalamp/textures/lavalamp_lamp_anim_yellow.png b/lavalamp/textures/lavalamp_lamp_anim_yellow.png
index 33914f62..706e3b2d 100644
Binary files a/lavalamp/textures/lavalamp_lamp_anim_yellow.png and b/lavalamp/textures/lavalamp_lamp_anim_yellow.png differ
diff --git a/lavalamp/textures/lavalamp_lamp_bottom.png b/lavalamp/textures/lavalamp_lamp_bottom.png
deleted file mode 100644
index 48e3d737..00000000
Binary files a/lavalamp/textures/lavalamp_lamp_bottom.png and /dev/null differ
diff --git a/lavalamp/textures/lavalamp_lamp_off.png b/lavalamp/textures/lavalamp_lamp_off.png
new file mode 100644
index 00000000..1fc70e55
Binary files /dev/null and b/lavalamp/textures/lavalamp_lamp_off.png differ
diff --git a/lavalamp/textures/lavalamp_lamp_off_sides.png b/lavalamp/textures/lavalamp_lamp_off_sides.png
deleted file mode 100644
index 4afc5285..00000000
Binary files a/lavalamp/textures/lavalamp_lamp_off_sides.png and /dev/null differ
diff --git a/lavalamp/textures/lavalamp_lamp_top.png b/lavalamp/textures/lavalamp_lamp_top.png
deleted file mode 100644
index e50f10c0..00000000
Binary files a/lavalamp/textures/lavalamp_lamp_top.png and /dev/null differ
diff --git a/lavalamp/textures/lavalamp_metal.png b/lavalamp/textures/lavalamp_metal.png
new file mode 100644
index 00000000..a34fc849
Binary files /dev/null and b/lavalamp/textures/lavalamp_metal.png differ