From bd398c7f2d300710fa96c851923fca681806e67d Mon Sep 17 00:00:00 2001
From: random-geek <35757396+random-geek@users.noreply.github.com>
Date: Fri, 6 Aug 2021 14:03:36 -0700
Subject: [PATCH] Clean up and optimize OBJ models

---
 .../models/morelights_modern_canlight.obj     | 206 +++++-----
 .../models/morelights_modern_tablelamp.obj    | 348 +++++++----------
 .../models/morelights_modern_walllamp.obj     | 245 ++++++------
 .../models/morelights_vintage_chandelier.obj  | 163 ++++----
 .../models/morelights_vintage_hangingbulb.obj | 366 +++++++++---------
 .../models/morelights_vintage_lantern_c.obj   | 204 +++++-----
 .../models/morelights_vintage_lantern_f.obj   | 247 ++++++------
 .../models/morelights_vintage_lantern_w.obj   | 276 +++++++------
 .../models/morelights_vintage_oillamp.obj     | 323 ++++++++--------
 .../models/morelights_vintage_streetlamp.obj  |  42 --
 10 files changed, 1145 insertions(+), 1275 deletions(-)
 delete mode 100644 morelights_vintage/models/morelights_vintage_streetlamp.obj

diff --git a/morelights_modern/models/morelights_modern_canlight.obj b/morelights_modern/models/morelights_modern_canlight.obj
index 9c42e46..280d96e 100644
--- a/morelights_modern/models/morelights_modern_canlight.obj
+++ b/morelights_modern/models/morelights_modern_canlight.obj
@@ -1,100 +1,115 @@
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T18:42:48Z | https://github.com/jonnenauha/obj-simplify
+
 # Blender v2.79 (sub 0) OBJ File: 'modern_can_2.blend'
 # www.blender.org
-o Cylinder_Cylinder.002
-v -0.051777 -0.000000 -0.125000
-v -0.051777 0.500000 -0.125000
-v 0.051777 0.500000 -0.125000
-v 0.051777 -0.000000 -0.125000
-v 0.125000 -0.000000 0.051777
-v 0.051777 -0.000000 0.125000
-v -0.051777 -0.000000 0.125000
-v -0.125000 -0.000000 0.051777
-v -0.125000 -0.000000 -0.051777
-v -0.100000 -0.000000 -0.041421
-v -0.100000 -0.000000 0.041421
-v -0.041421 -0.000000 0.100000
-v 0.041421 -0.000000 0.100000
-v 0.100000 -0.000000 0.041421
-v 0.125000 -0.000000 -0.051777
-v 0.100000 -0.000000 -0.041421
-v 0.041421 -0.000000 -0.100000
-v -0.041421 -0.000000 -0.100000
-v -0.125000 0.500000 -0.051777
-v -0.125000 0.500000 0.051777
-v -0.051777 0.500000 0.125000
-v 0.051777 0.500000 0.125000
-v 0.125000 0.500000 0.051777
-v 0.125000 0.500000 -0.051777
-v 0.041421 0.125000 -0.100000
-v -0.041421 0.125000 -0.100000
-v -0.100000 0.125000 -0.041421
-v 0.100000 0.125000 -0.041421
-v 0.100000 0.125000 0.041421
-v 0.041421 0.125000 0.100000
-v -0.041421 0.125000 0.100000
-v -0.100000 0.125000 0.041421
-vt 0.375000 0.500000
-vt 0.375000 1.000000
-vt 0.250000 1.000000
-vt 0.250000 0.500000
-vt 0.500000 0.500000
-vt 0.500000 1.000000
-vt 0.239277 0.937500
-vt 0.135723 0.937500
-vt 0.062500 0.864257
-vt 0.062500 0.760704
-vt 0.135723 0.687500
-vt 0.239277 0.687500
-vt 0.312500 0.760704
-vt 0.312500 0.864257
-vt 0.125000 1.000000
-vt 0.125000 0.500000
-vt 0.000000 1.000000
-vt 0.000000 0.500000
-vt 1.000000 0.500000
-vt 1.000000 1.000000
-vt 0.875000 1.000000
-vt 0.875000 0.500000
-vt 0.750000 1.000000
-vt 0.750000 0.500000
-vt 0.625000 1.000000
-vt 0.625000 0.500000
-vt 0.375000 0.437500
-vt 0.250000 0.437500
-vt 0.250000 0.312500
-vt 0.375000 0.312500
-vt 0.500000 0.437500
-vt 0.500000 0.312500
-vt 0.176777 0.000000
-vt 0.250000 0.073223
-vt 0.250000 0.176777
-vt 0.176777 0.250000
-vt 0.073223 0.250000
-vt 0.000000 0.176777
-vt 0.000000 0.073223
-vt 0.073223 0.000000
-vt 0.125000 0.437500
-vt 0.125000 0.312500
-vt 0.625000 0.437500
-vt 0.625000 0.312500
-vt 0.750000 0.437500
-vt 0.750000 0.312500
-vt 0.875000 0.437500
-vt 0.875000 0.312500
-vt 1.000000 0.437500
-vt 1.000000 0.312500
-vt 0.000000 0.437500
-vt 0.000000 0.312500
-vn 0.0000 0.0000 -1.0000
-vn -0.7071 0.0000 -0.7071
-vn 0.0000 1.0000 -0.0000
-vn 0.7071 0.0000 -0.7071
-vn 1.0000 0.0000 0.0000
-vn 0.7071 0.0000 0.7071
-vn -0.0000 0.0000 1.0000
-vn -0.7071 0.0000 0.7071
-vn -1.0000 0.0000 0.0000
-vn 0.0000 -1.0000 0.0000
+
+# vertices [32]
+
+v -0.051777 0 -0.125
+v -0.051777 0.5 -0.125
+v 0.051777 0.5 -0.125
+v 0.051777 0 -0.125
+v 0.125 0 0.051777
+v 0.051777 0 0.125
+v -0.051777 0 0.125
+v -0.125 0 0.051777
+v -0.125 0 -0.051777
+v -0.1 0 -0.041421
+v -0.1 0 0.041421
+v -0.041421 0 0.1
+v 0.041421 0 0.1
+v 0.1 0 0.041421
+v 0.125 0 -0.051777
+v 0.1 0 -0.041421
+v 0.041421 0 -0.1
+v -0.041421 0 -0.1
+v -0.125 0.5 -0.051777
+v -0.125 0.5 0.051777
+v -0.051777 0.5 0.125
+v 0.051777 0.5 0.125
+v 0.125 0.5 0.051777
+v 0.125 0.5 -0.051777
+v 0.041421 0.125 -0.1
+v -0.041421 0.125 -0.1
+v -0.1 0.125 -0.041421
+v 0.1 0.125 -0.041421
+v 0.1 0.125 0.041421
+v 0.041421 0.125 0.1
+v -0.041421 0.125 0.1
+v -0.1 0.125 0.041421
+
+# normals [10]
+
+vn 0 0 -1
+vn -0.7071 0 -0.7071
+vn 0 1 0
+vn 0.7071 0 -0.7071
+vn 1 0 0
+vn 0.7071 0 0.7071
+vn 0 0 1
+vn -0.7071 0 0.7071
+vn -1 0 0
+vn 0 -1 0
+
+# uvs [52]
+
+vt 0.375 0.5
+vt 0.375 1
+vt 0.25 1
+vt 0.25 0.5
+vt 0.5 0.5
+vt 0.5 1
+vt 0.239277 0.9375
+vt 0.135723 0.9375
+vt 0.0625 0.864257
+vt 0.0625 0.760704
+vt 0.135723 0.6875
+vt 0.239277 0.6875
+vt 0.3125 0.760704
+vt 0.3125 0.864257
+vt 0.125 1
+vt 0.125 0.5
+vt 0 1
+vt 0 0.5
+vt 1 0.5
+vt 1 1
+vt 0.875 1
+vt 0.875 0.5
+vt 0.75 1
+vt 0.75 0.5
+vt 0.625 1
+vt 0.625 0.5
+vt 0.375 0.4375
+vt 0.25 0.4375
+vt 0.25 0.3125
+vt 0.375 0.3125
+vt 0.5 0.4375
+vt 0.5 0.3125
+vt 0.176777 0
+vt 0.25 0.073223
+vt 0.25 0.176777
+vt 0.176777 0.25
+vt 0.073223 0.25
+vt 0 0.176777
+vt 0 0.073223
+vt 0.073223 0
+vt 0.125 0.4375
+vt 0.125 0.3125
+vt 0.625 0.4375
+vt 0.625 0.3125
+vt 0.75 0.4375
+vt 0.75 0.3125
+vt 0.875 0.4375
+vt 0.875 0.3125
+vt 1 0.4375
+vt 1 0.3125
+vt 0 0.4375
+vt 0 0.3125
+
+# objects [1]
+
+o CanLight
+
 s off
 f 1/1/1 2/2/1 3/3/1 4/4/1
 f 9/5/2 19/6/2 2/2/2 1/1/2
@@ -122,3 +137,4 @@ f 14/49/10 5/19/10 6/22/10 13/47/10
 f 13/47/10 6/22/10 7/24/10 12/45/10
 f 7/24/10 8/26/10 11/43/10 12/45/10
 f 11/43/10 8/26/10 9/5/10 10/31/10
+
diff --git a/morelights_modern/models/morelights_modern_tablelamp.obj b/morelights_modern/models/morelights_modern_tablelamp.obj
index 11f38bb..7c19dbb 100644
--- a/morelights_modern/models/morelights_modern_tablelamp.obj
+++ b/morelights_modern/models/morelights_modern_tablelamp.obj
@@ -1,204 +1,146 @@
-# Blender v2.79 (sub 0) OBJ File: 'modern_tablelamp_joined.blend'
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T06:56:07Z | https://github.com/jonnenauha/obj-simplify
+
+# Blender v2.93.0 OBJ File: ''
 # www.blender.org
-o support_Plane.001
-v 0.031250 0.312500 0.031250
-v 0.218750 0.312500 0.031250
-v 0.031250 0.343750 0.000000
-v 0.218750 0.343750 0.000000
-v 0.031250 0.312500 -0.031250
-v 0.218750 0.312500 -0.031250
-v -0.218750 0.312500 0.031250
-v -0.031250 0.312500 0.031250
-v -0.218750 0.343750 0.000000
-v -0.031250 0.343750 0.000000
-v -0.218750 0.312500 -0.031250
-v -0.031250 0.312500 -0.031250
-vt 0.531250 0.468748
-vt 0.718750 0.468748
-vt 0.718750 0.499998
-vt 0.531250 0.499998
-vt 0.718750 0.531248
-vt 0.531250 0.531248
-vt 0.281250 0.468748
-vt 0.468750 0.468748
-vt 0.468750 0.499998
-vt 0.281250 0.499998
-vt 0.468750 0.531248
-vt 0.281250 0.531248
-vn 0.0000 0.7071 0.7071
-vn 0.0000 0.7071 -0.7071
-g Material.000
-s off
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 3/4/2 4/3/2 6/5/2 5/6/2
-f 7/7/1 8/8/1 10/9/1 9/10/1
-f 9/10/2 10/9/2 12/11/2 11/12/2
-o pole_Cube.007
-v -0.031250 -0.437500 0.031250
-v -0.031250 0.375000 0.031250
-v -0.031250 -0.437500 -0.031250
-v -0.031250 0.375000 -0.031250
-v 0.031250 -0.437500 0.031250
-v 0.031250 0.375000 0.031250
-v 0.031250 -0.437500 -0.031250
-v 0.031250 0.375000 -0.031250
-vt 0.312500 0.062500
-vt 0.312500 0.875000
-vt 0.250000 0.875000
-vt 0.250000 0.062500
-vt 0.312500 0.062500
-vt 0.312500 0.875000
-vt 0.250000 0.875000
-vt 0.250000 0.062500
-vt 0.312500 0.062500
-vt 0.312500 0.875000
-vt 0.250000 0.875000
-vt 0.250000 0.062500
-vt 0.312501 0.062500
-vt 0.312499 0.875000
-vt 0.250000 0.875000
-vt 0.250000 0.062500
-vt 0.312500 0.531250
-vt 0.250000 0.531250
-vt 0.250000 0.468750
-vt 0.312500 0.468750
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 1.0000 0.0000
-g Material.000
-s off
-f 13/13/3 14/14/3 16/15/3 15/16/3
-f 15/17/4 16/18/4 20/19/4 19/20/4
-f 19/21/5 20/22/5 18/23/5 17/24/5
-f 17/25/6 18/26/6 14/27/6 13/28/6
-f 20/29/7 16/30/7 14/31/7 18/32/7
-o base_Cube.006
-v -0.187500 -0.500000 0.187500
-v -0.187500 -0.437500 0.187500
-v -0.187500 -0.500000 -0.187500
-v -0.187500 -0.437500 -0.187500
-v 0.187500 -0.500000 0.187500
-v 0.187500 -0.437500 0.187500
-v 0.187500 -0.500000 -0.187500
-v 0.187500 -0.437500 -0.187500
-vt 0.312500 0.062500
-vt 0.312500 0.000000
-vt 0.687500 0.000000
-vt 0.687500 0.062500
-vt 0.312500 0.062500
-vt 0.312500 0.000000
-vt 0.687500 0.000000
-vt 0.687500 0.062500
-vt 0.687500 0.000000
-vt 0.687500 0.062500
-vt 0.312500 0.062500
-vt 0.312500 0.000000
-vt 0.687500 0.000000
-vt 0.687500 0.062500
-vt 0.312500 0.062500
-vt 0.312500 0.000000
-vt 0.687500 0.312500
-vt 0.687500 0.687500
-vt 0.312500 0.687500
-vt 0.312500 0.312500
-vt 0.687500 0.312500
-vt 0.687500 0.687500
-vt 0.312500 0.687500
-vt 0.312500 0.312500
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-g Material.000
-s off
-f 21/33/8 22/34/8 24/35/8 23/36/8
-f 23/37/9 24/38/9 28/39/9 27/40/9
-f 27/41/10 28/42/10 26/43/10 25/44/10
-f 25/45/11 26/46/11 22/47/11 21/48/11
-f 23/49/12 27/50/12 25/51/12 21/52/12
-f 28/53/13 24/54/13 22/55/13 26/56/13
-o shade_Cube.005
-v -0.250000 -0.062500 0.250000
-v -0.250000 0.437500 0.250000
-v -0.250000 -0.062500 -0.250000
-v -0.250000 0.437500 -0.250000
-v 0.250000 -0.062500 0.250000
-v 0.250000 0.437500 0.250000
-v 0.250000 -0.062500 -0.250000
-v 0.250000 0.437500 -0.250000
-v -0.218750 -0.062500 0.218750
-v -0.218750 0.437500 0.218750
-v -0.218750 -0.062500 -0.218750
-v -0.218750 0.437500 -0.218750
-v 0.218750 -0.062500 0.218750
-v 0.218750 0.437500 0.218750
-v 0.218750 -0.062500 -0.218750
-v 0.218750 0.437500 -0.218750
-vt 0.000000 0.000000
-vt 0.000000 1.000000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vt 0.000000 0.000000
-vt 0.000000 1.000000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.062500 0.000000
-vt 0.062500 1.000000
-vt 0.937500 1.000000
-vt 0.937500 0.000000
-vt 0.062500 0.000000
-vt 0.062500 1.000000
-vt 0.937500 1.000000
-vt 0.937500 0.000000
-vt 0.062500 0.000000
-vt 0.062500 1.000000
-vt 0.937500 1.000000
-vt 0.937500 0.000000
-vt 0.062500 0.000000
-vt 0.062500 1.000000
-vt 0.937500 1.000000
-vt 0.937500 0.000000
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 0.937500 0.062500
-vt 0.062500 0.062500
-vt 0.062500 0.937500
-vt 0.937500 0.937500
-vt 0.000000 1.000000
-vt 0.062500 0.062500
-vt 0.062500 0.937500
-vt 0.937500 0.062500
-vt 1.000000 1.000000
-vt 0.937500 0.937500
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 1.0000 0.0000
-vn 0.0000 -1.0000 0.0000
-g Material.001
-s off
-f 29/57/14 30/58/14 32/59/14 31/60/14
-f 31/61/15 32/62/15 36/63/15 35/64/15
-f 35/64/16 36/63/16 34/65/16 33/66/16
-f 33/67/17 34/68/17 30/58/17 29/57/17
-f 39/69/15 40/70/15 44/71/15 43/72/15
-f 37/73/14 38/74/14 40/75/14 39/76/14
-f 43/77/16 44/78/16 42/79/16 41/80/16
-f 41/81/17 42/82/17 38/83/17 37/84/17
-f 30/85/18 34/86/18 42/87/18 38/88/18
-f 32/62/18 30/85/18 38/88/18 40/89/18
-f 36/63/18 32/62/18 40/89/18 44/90/18
-f 34/86/18 36/63/18 44/90/18 42/87/18
-f 29/91/19 31/61/19 39/92/19 37/93/19
-f 31/61/19 35/64/19 43/94/19 39/92/19
-f 35/64/19 33/95/19 41/96/19 43/94/19
-f 33/95/19 29/91/19 37/93/19 41/96/19
+
+# vertices [44]
+
+v -0.1875 -0.5 0.1875
+v -0.1875 -0.4375 0.1875
+v -0.1875 -0.4375 -0.1875
+v -0.1875 -0.5 -0.1875
+v 0.1875 -0.4375 -0.1875
+v 0.1875 -0.5 -0.1875
+v 0.1875 -0.4375 0.1875
+v 0.1875 -0.5 0.1875
+v 0.03125 0.3125 0.03125
+v 0.21875 0.3125 0.03125
+v 0.21875 0.34375 0
+v 0.03125 0.34375 0
+v 0.21875 0.3125 -0.03125
+v 0.03125 0.3125 -0.03125
+v -0.21875 0.3125 0.03125
+v -0.03125 0.3125 0.03125
+v -0.03125 0.34375 0
+v -0.21875 0.34375 0
+v -0.03125 0.3125 -0.03125
+v -0.21875 0.3125 -0.03125
+v -0.03125 -0.4375 0.03125
+v -0.03125 0.375 0.03125
+v -0.03125 0.375 -0.03125
+v -0.03125 -0.4375 -0.03125
+v 0.03125 0.375 -0.03125
+v 0.03125 -0.4375 -0.03125
+v 0.03125 0.375 0.03125
+v 0.03125 -0.4375 0.03125
+v -0.25 -0.0625 0.25
+v -0.25 0.4375 0.25
+v -0.25 0.4375 -0.25
+v -0.25 -0.0625 -0.25
+v 0.25 0.4375 -0.25
+v 0.25 -0.0625 -0.25
+v 0.25 0.4375 0.25
+v 0.25 -0.0625 0.25
+v -0.21875 -0.0625 -0.21875
+v -0.21875 0.4375 -0.21875
+v 0.21875 0.4375 -0.21875
+v 0.21875 -0.0625 -0.21875
+v -0.21875 -0.0625 0.21875
+v -0.21875 0.4375 0.21875
+v 0.21875 0.4375 0.21875
+v 0.21875 -0.0625 0.21875
+
+# normals [8]
+
+vn -1 0 0
+vn 0 0 -1
+vn 1 0 0
+vn 0 0 1
+vn 0 -1 0
+vn 0 1 0
+vn 0 0.7071 0.7071
+vn 0 0.7071 -0.7071
+
+# uvs [39]
+
+vt 0.3125 0.0625
+vt 0.3125 0
+vt 0.6875 0
+vt 0.6875 0.0625
+vt 0.6875 0.3125
+vt 0.6875 0.6875
+vt 0.3125 0.6875
+vt 0.3125 0.3125
+vt 0.53125 0.46875
+vt 0.71875 0.46875
+vt 0.71875 0.5
+vt 0.53125 0.5
+vt 0.71875 0.53125
+vt 0.53125 0.53125
+vt 0.28125 0.46875
+vt 0.46875 0.46875
+vt 0.46875 0.5
+vt 0.28125 0.5
+vt 0.46875 0.53125
+vt 0.28125 0.53125
+vt 0.3125 0.875
+vt 0.25 0.875
+vt 0.25 0.0625
+vt 0.3125 0.53125
+vt 0.25 0.53125
+vt 0.25 0.46875
+vt 0.3125 0.46875
+vt 0 0
+vt 0 1
+vt 1 1
+vt 1 0
+vt 0.0625 0
+vt 0.0625 1
+vt 0.9375 1
+vt 0.9375 0
+vt 0.9375 0.0625
+vt 0.0625 0.0625
+vt 0.0625 0.9375
+vt 0.9375 0.9375
+
+# objects [2]
+
+g LampBase
+
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 4/1/2 3/2/2 5/3/2 6/4/2
+f 6/3/3 5/4/3 7/1/3 8/2/3
+f 8/3/4 7/4/4 2/1/4 1/2/4
+f 4/5/5 6/6/5 8/7/5 1/8/5
+f 5/5/6 3/6/6 2/7/6 7/8/6
+f 9/9/7 10/10/7 11/11/7 12/12/7
+f 12/12/8 11/11/8 13/13/8 14/14/8
+f 15/15/7 16/16/7 17/17/7 18/18/7
+f 18/18/8 17/17/8 19/19/8 20/20/8
+f 21/1/1 22/21/1 23/22/1 24/23/1
+f 24/1/2 23/21/2 25/22/2 26/23/2
+f 26/1/3 25/21/3 27/22/3 28/23/3
+f 28/1/4 27/21/4 22/22/4 21/23/4
+f 25/24/6 23/25/6 22/26/6 27/27/6
+
+g LampShade
+
+s 1
+f 29/28/1 30/29/1 31/30/1 32/31/1
+f 32/28/2 31/29/2 33/30/2 34/31/2
+f 34/31/3 33/30/3 35/29/3 36/28/3
+f 36/31/4 35/30/4 30/29/4 29/28/4
+f 37/32/2 38/33/2 39/34/2 40/35/2
+f 41/32/1 42/33/1 38/34/1 37/35/1
+f 40/32/3 39/33/3 43/34/3 44/35/3
+f 44/32/4 43/33/4 42/34/4 41/35/4
+f 30/28/6 35/31/6 43/36/6 42/37/6
+f 31/29/6 30/28/6 42/37/6 38/38/6
+f 33/30/6 31/29/6 38/38/6 39/39/6
+f 35/31/6 33/30/6 39/39/6 43/36/6
+f 29/29/5 32/28/5 37/37/5 41/38/5
+f 32/28/5 34/31/5 40/36/5 37/37/5
+f 34/31/5 36/30/5 44/39/5 40/36/5
+f 36/30/5 29/29/5 41/38/5 44/39/5
+
diff --git a/morelights_modern/models/morelights_modern_walllamp.obj b/morelights_modern/models/morelights_modern_walllamp.obj
index e9e7fcc..3baab52 100644
--- a/morelights_modern/models/morelights_modern_walllamp.obj
+++ b/morelights_modern/models/morelights_modern_walllamp.obj
@@ -1,132 +1,115 @@
-# Blender v2.79 (sub 0) OBJ File: 'walllamp.blend'
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T19:07:59Z | https://github.com/jonnenauha/obj-simplify
+
+# Blender v2.93.0 OBJ File: ''
 # www.blender.org
-o Cube.003
-v 0.031250 -0.343750 0.437500
-v 0.031250 -0.281250 0.437500
-v -0.031250 -0.343750 0.437500
-v -0.031250 -0.281250 0.437500
-v 0.031250 -0.343750 0.218750
-v 0.031250 -0.281250 0.281250
-v -0.031250 -0.343750 0.218750
-v -0.031250 -0.281250 0.281250
-v 0.031250 -0.250000 0.218750
-v 0.031250 -0.250000 0.281250
-v -0.031250 -0.250000 0.218750
-v -0.031250 -0.250000 0.281250
-vt 0.031250 0.062500
-vt 0.031250 0.125000
-vt 0.187500 0.125000
-vt 0.250000 0.062500
-vt 0.187500 0.156250
-vt 0.250000 0.156250
-vt 0.250000 0.062500
-vt 0.187500 0.125000
-vt 0.031250 0.125000
-vt 0.031250 0.062500
-vt 0.250000 0.000000
-vt 0.031250 0.000000
-vt 0.187500 0.250000
-vt 0.031250 0.250000
-vt 0.031250 0.187500
-vt 0.187500 0.187500
-vt 0.250000 0.156250
-vt 0.187500 0.156250
-vt 0.343750 0.062500
-vt 0.343750 0.000000
-vt 0.218750 0.187500
-vt 0.218750 0.250000
-vn -1.0000 -0.0000 -0.0000
-vn 1.0000 -0.0000 0.0000
-vn 0.0000 -1.0000 -0.0000
-vn 0.0000 1.0000 -0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 0.0000 1.0000
-s off
-f 3/1/1 4/2/1 8/3/1 7/4/1
-f 7/4/1 8/3/1 12/5/1 11/6/1
-f 5/7/2 6/8/2 2/9/2 1/10/2
-f 3/1/3 7/4/3 5/11/3 1/12/3
-f 8/13/4 4/14/4 2/15/4 6/16/4
-f 6/8/2 5/7/2 9/17/2 10/18/2
-f 5/11/5 7/4/5 11/19/5 9/20/5
-f 8/13/6 6/16/6 10/21/6 12/22/6
-o Cube.002
-v 0.125000 -0.375000 0.500000
-v 0.125000 0.125000 0.500000
-v -0.125000 -0.375000 0.500000
-v -0.125000 0.125000 0.500000
-v 0.125000 -0.375000 0.437500
-v 0.125000 0.125000 0.437500
-v -0.125000 -0.375000 0.437500
-v -0.125000 0.125000 0.437500
-vt 0.937500 0.000000
-vt 0.937500 0.500000
-vt 0.687500 0.500000
-vt 0.687500 0.000000
-vt 0.625000 0.500000
-vt 0.625000 0.000000
-vt 0.375000 0.500000
-vt 0.375000 0.000000
-vt 0.312500 0.500000
-vt 0.312500 0.000000
-vt 0.937500 0.250000
-vt 1.000000 0.250000
-vt 1.000000 0.500000
-vt 0.937500 0.500000
-vt 0.937500 0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.250000
-vt 0.937500 0.250000
-vn 0.0000 0.0000 1.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-s off
-f 13/23/7 14/24/7 16/25/7 15/26/7
-f 15/26/8 16/25/8 20/27/8 19/28/8
-f 19/28/9 20/27/9 18/29/9 17/30/9
-f 17/30/10 18/29/10 14/31/10 13/32/10
-f 15/33/11 19/34/11 17/35/11 13/36/11
-f 20/37/12 16/38/12 14/39/12 18/40/12
-o Cube.001
-v 0.125000 -0.250000 0.375000
-v 0.125000 0.250000 0.375000
-v -0.125000 -0.250000 0.375000
-v -0.125000 0.250000 0.375000
-v 0.125000 -0.250000 0.125000
-v 0.125000 0.250000 0.125000
-v -0.125000 -0.250000 0.125000
-v -0.125000 0.250000 0.125000
-vt 1.000000 0.500000
-vt 1.000000 1.000000
-vt 0.750000 1.000000
-vt 0.750000 0.500000
-vt 0.500000 1.000000
-vt 0.500000 0.500000
-vt 0.250000 1.000000
-vt 0.250000 0.500000
-vt 0.000000 1.000000
-vt 0.000000 0.500000
-vt 0.250000 0.500000
-vt 0.000000 0.500000
-vt 0.000000 0.250000
-vt 0.250000 0.250000
-vt 0.250000 0.500000
-vt 0.000000 0.500000
-vt 0.000000 0.250000
-vt 0.250000 0.250000
-vn 0.0000 0.0000 1.0000
-vn -1.0000 0.0000 -0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-s off
-f 21/41/13 22/42/13 24/43/13 23/44/13
-f 23/44/14 24/43/14 28/45/14 27/46/14
-f 27/46/15 28/45/15 26/47/15 25/48/15
-f 25/48/16 26/47/16 22/49/16 21/50/16
-f 23/51/17 27/52/17 25/53/17 21/54/17
-f 28/55/18 24/56/18 22/57/18 26/58/18
+
+# vertices [28]
+
+v 0.125 -0.25 0.375
+v 0.125 0.25 0.375
+v -0.125 0.25 0.375
+v -0.125 -0.25 0.375
+v -0.125 0.25 0.125
+v -0.125 -0.25 0.125
+v 0.125 0.25 0.125
+v 0.125 -0.25 0.125
+v -0.03125 -0.34375 0.4375
+v -0.03125 -0.28125 0.4375
+v -0.03125 -0.28125 0.28125
+v -0.03125 -0.34375 0.21875
+v -0.03125 -0.25 0.28125
+v -0.03125 -0.25 0.21875
+v 0.03125 -0.34375 0.21875
+v 0.03125 -0.28125 0.28125
+v 0.03125 -0.28125 0.4375
+v 0.03125 -0.34375 0.4375
+v 0.03125 -0.25 0.21875
+v 0.03125 -0.25 0.28125
+v 0.125 -0.375 0.5
+v 0.125 0.125 0.5
+v -0.125 0.125 0.5
+v -0.125 -0.375 0.5
+v -0.125 0.125 0.4375
+v -0.125 -0.375 0.4375
+v 0.125 0.125 0.4375
+v 0.125 -0.375 0.4375
+
+# normals [6]
+
+vn 0 0 1
+vn -1 0 0
+vn 0 0 -1
+vn 1 0 0
+vn 0 -1 0
+vn 0 1 0
+
+# uvs [41]
+
+vt 1 0.5
+vt 1 1
+vt 0.75 1
+vt 0.75 0.5
+vt 0.5 1
+vt 0.5 0.5
+vt 0.25 1
+vt 0.25 0.5
+vt 0 1
+vt 0 0.5
+vt 0 0.25
+vt 0.25 0.25
+vt 0.03125 0.0625
+vt 0.03125 0.125
+vt 0.1875 0.125
+vt 0.25 0.0625
+vt 0.1875 0.15625
+vt 0.25 0.15625
+vt 0.25 0
+vt 0.03125 0
+vt 0.1875 0.25
+vt 0.03125 0.25
+vt 0.03125 0.1875
+vt 0.1875 0.1875
+vt 0.34375 0.0625
+vt 0.34375 0
+vt 0.21875 0.1875
+vt 0.21875 0.25
+vt 0.9375 0
+vt 0.9375 0.5
+vt 0.6875 0.5
+vt 0.6875 0
+vt 0.625 0.5
+vt 0.625 0
+vt 0.375 0.5
+vt 0.375 0
+vt 0.3125 0.5
+vt 0.3125 0
+vt 0.9375 0.25
+vt 1 0.25
+vt 1 0
+
+# objects [1]
+
+o WallLamp
+
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 4/4/2 3/3/2 5/5/2 6/6/2
+f 6/6/3 5/5/3 7/7/3 8/8/3
+f 8/8/4 7/7/4 2/9/4 1/10/4
+f 4/8/5 6/10/5 8/11/5 1/12/5
+f 5/8/6 3/10/6 2/11/6 7/12/6
+f 9/13/2 10/14/2 11/15/2 12/16/2
+f 12/16/2 11/15/2 13/17/2 14/18/2
+f 15/16/4 16/15/4 17/14/4 18/13/4
+f 9/13/5 12/16/5 15/19/5 18/20/5
+f 11/21/6 10/22/6 17/23/6 16/24/6
+f 16/15/4 15/16/4 19/18/4 20/17/4
+f 15/19/3 12/16/3 14/25/3 19/26/3
+f 11/21/1 16/24/1 20/27/1 13/28/1
+f 21/29/1 22/30/1 23/31/1 24/32/1
+f 24/32/2 23/31/2 25/33/2 26/34/2
+f 26/34/3 25/33/3 27/35/3 28/36/3
+f 28/36/4 27/35/4 22/37/4 21/38/4
+f 24/39/5 26/40/5 28/1/5 21/30/5
+f 25/29/6 23/41/6 22/40/6 27/39/6
+
diff --git a/morelights_vintage/models/morelights_vintage_chandelier.obj b/morelights_vintage/models/morelights_vintage_chandelier.obj
index 22fd05b..4bdcedd 100644
--- a/morelights_vintage/models/morelights_vintage_chandelier.obj
+++ b/morelights_vintage/models/morelights_vintage_chandelier.obj
@@ -1,79 +1,86 @@
-# Blender v2.79 (sub 0) OBJ File: 'vintage_chandelier.blend'
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T19:28:47Z | https://github.com/jonnenauha/obj-simplify
+
+# Blender v2.93.0 OBJ File: ''
 # www.blender.org
-o Plane.001_Plane.005
-v 0.250000 -0.500000 -0.433013
-v -0.250000 -0.500000 0.433013
-v 0.250000 0.500000 -0.433013
-v -0.250000 0.500000 0.433013
-v -0.250000 -0.500000 -0.433013
-v 0.250000 -0.500000 0.433013
-v -0.250000 0.500000 -0.433013
-v 0.250000 0.500000 0.433013
-v 0.500000 -0.500000 0.000000
-v -0.500000 -0.500000 0.000000
-v 0.500000 0.500000 -0.000000
-v -0.500000 0.500000 0.000000
-v 0.000000 -0.500000 0.000000
-v -0.000000 0.500000 -0.000000
-vt 0.000000 0.000000
-vt 0.500000 0.000000
-vt 0.500000 1.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 0.000000 1.000000
-vt 0.000000 0.000000
-vt 0.000000 1.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vn -0.8660 -0.0000 -0.5000
-vn -0.8660 -0.0000 0.5000
-vn -0.0000 -0.0000 -1.0000
-g Plane.001_Plane.005_Material.001
-s off
-f 1/1/1 13/2/1 14/3/1 3/4/1
-f 5/5/2 13/2/2 14/3/2 7/6/2
-f 9/7/3 13/2/3 14/3/3 11/8/3
-f 14/3/1 13/2/1 2/9/1 4/10/1
-f 14/3/2 13/2/2 6/11/2 8/12/2
-f 14/3/3 13/2/3 10/13/3 12/14/3
-o Cube
-v 0.031250 -0.375000 -0.031250
-v 0.031250 -0.375000 0.031250
-v -0.031250 -0.375000 0.031250
-v -0.031250 -0.375000 -0.031250
-v 0.031250 0.500000 -0.031250
-v 0.031250 0.500000 0.031250
-v -0.031250 0.500000 0.031250
-v -0.031250 0.500000 -0.031250
-vt 0.437500 0.062500
-vt 0.375000 0.062500
-vt 0.375000 0.000000
-vt 0.437500 0.000000
-vt 0.437500 0.937500
-vt 0.437500 1.000000
-vt 0.375000 1.000000
-vt 0.375000 0.937500
-vt 0.625000 0.062500
-vt 0.625000 0.937500
-vt 0.562500 0.937500
-vt 0.562500 0.062500
-vt 0.500000 0.937500
-vt 0.500000 0.062500
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-vn 1.0000 0.0000 0.0000
-vn -0.0000 -0.0000 1.0000
-vn -1.0000 -0.0000 -0.0000
-vn 0.0000 0.0000 -1.0000
-g Cube_Cube_Material
-s off
-f 15/15/4 16/16/4 17/17/4 18/18/4
-f 19/19/5 22/20/5 21/21/5 20/22/5
-f 15/15/6 19/19/6 20/22/6 16/16/6
-f 16/23/7 20/24/7 21/25/7 17/26/7
-f 17/26/8 21/25/8 22/27/8 18/28/8
-f 19/19/9 15/15/9 18/28/9 22/27/9
+
+# vertices [22]
+
+v 0.25 -0.5 -0.433013
+v 0 -0.5 0
+v 0 0.5 0
+v 0.25 0.5 -0.433013
+v -0.25 -0.5 -0.433013
+v -0.25 0.5 -0.433013
+v 0.5 -0.5 0
+v 0.5 0.5 0
+v -0.25 -0.5 0.433013
+v -0.25 0.5 0.433013
+v 0.25 -0.5 0.433013
+v 0.25 0.5 0.433013
+v -0.5 -0.5 0
+v -0.5 0.5 0
+v 0.03125 -0.375 -0.03125
+v 0.03125 -0.375 0.03125
+v -0.03125 -0.375 0.03125
+v -0.03125 -0.375 -0.03125
+v 0.03125 0.5 -0.03125
+v -0.03125 0.5 -0.03125
+v -0.03125 0.5 0.03125
+v 0.03125 0.5 0.03125
+
+# normals [8]
+
+vn -0.866 0 -0.5
+vn -0.866 0 0.5
+vn 0 0 -1
+vn 0 -1 0
+vn 0 1 0
+vn 1 0 0
+vn 0 0 1
+vn -1 0 0
+
+# uvs [20]
+
+vt 0 0
+vt 0.5 0
+vt 0.5 1
+vt 0 1
+vt 1 0
+vt 1 1
+vt 0.4375 0.0625
+vt 0.375 0.0625
+vt 0.375 0
+vt 0.4375 0
+vt 0.4375 0.9375
+vt 0.4375 1
+vt 0.375 1
+vt 0.375 0.9375
+vt 0.625 0.0625
+vt 0.625 0.9375
+vt 0.5625 0.9375
+vt 0.5625 0.0625
+vt 0.5 0.9375
+vt 0.5 0.0625
+
+# objects [2]
+
+g Chandelier
+
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 5/1/2 2/2/2 3/3/2 6/4/2
+f 7/1/3 2/2/3 3/3/3 8/4/3
+f 3/3/1 2/2/1 9/5/1 10/6/1
+f 3/3/2 2/2/2 11/5/2 12/6/2
+f 3/3/3 2/2/3 13/5/3 14/6/3
+
+g Pole
+
+s 1
+f 15/7/4 16/8/4 17/9/4 18/10/4
+f 19/11/5 20/12/5 21/13/5 22/14/5
+f 15/7/6 19/11/6 22/14/6 16/8/6
+f 16/15/7 22/16/7 21/17/7 17/18/7
+f 17/18/8 21/17/8 20/19/8 18/20/8
+f 19/11/3 15/7/3 18/20/3 20/19/3
+
diff --git a/morelights_vintage/models/morelights_vintage_hangingbulb.obj b/morelights_vintage/models/morelights_vintage_hangingbulb.obj
index 0f1ba38..f3651be 100644
--- a/morelights_vintage/models/morelights_vintage_hangingbulb.obj
+++ b/morelights_vintage/models/morelights_vintage_hangingbulb.obj
@@ -1,108 +1,57 @@
-# Blender v2.79 (sub 0) OBJ File: 'bulb.blend'
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T20:35:12Z | https://github.com/jonnenauha/obj-simplify
+
+# Blender v2.93.0 OBJ File: ''
 # www.blender.org
-o Cube_Cube.009
-v -0.031250 0.093750 0.031250
-v -0.031250 0.343750 0.031250
-v -0.031250 0.093750 -0.031250
-v -0.031250 0.343750 -0.031250
-v 0.031250 0.093750 0.031250
-v 0.031250 0.343750 0.031250
-v 0.031250 0.093750 -0.031250
-v 0.031250 0.343750 -0.031250
-v 0.000000 0.343750 0.000000
-v 0.000000 0.093750 0.000000
-vt 0.000000 1.000000
-vt 0.000000 0.750000
-vt 0.031251 0.750000
-vt 0.031249 1.000000
-vt 0.062501 0.750000
-vt 0.062499 1.000000
-vt 0.000000 0.750000
-vt 0.000000 1.000000
-vt 0.062499 1.000000
-vt 0.062501 0.750000
-vn -0.7071 0.0000 0.7071
-vn -0.7071 0.0000 -0.7071
-s off
-f 4/1/1 3/2/1 10/3/1 9/4/1
-f 1/5/2 2/6/2 9/4/2 10/3/2
-f 9/4/1 10/3/1 5/7/1 6/8/1
-f 10/3/2 9/4/2 8/9/2 7/10/2
-o Cube.002_Cube.007
-v -0.062500 0.000000 0.062500
-v -0.062500 0.031250 0.093750
-v -0.093750 0.031250 0.062500
-v -0.062500 0.312500 0.093750
-v -0.062500 0.343750 0.062500
-v -0.093750 0.312500 0.062500
-v -0.062500 0.000000 -0.062500
-v -0.093750 0.031250 -0.062500
-v -0.062500 0.031250 -0.093750
-v -0.062500 0.343750 -0.062500
-v -0.062500 0.312500 -0.093750
-v -0.093750 0.312500 -0.062500
-v 0.062500 0.000000 0.062500
-v 0.093750 0.031250 0.062500
-v 0.062500 0.031250 0.093750
-v 0.062500 0.343750 0.062500
-v 0.062500 0.312500 0.093750
-v 0.093750 0.312500 0.062500
-v 0.062500 0.000000 -0.062500
-v 0.062500 0.031250 -0.093750
-v 0.093750 0.031250 -0.062500
-v 0.062500 0.343750 -0.062500
-v 0.093750 0.312500 -0.062500
-v 0.062500 0.312500 -0.093750
-vt 0.437500 0.656250
-vt 0.437500 0.937500
-vt 0.312500 0.937500
-vt 0.312500 0.656250
-vt 0.625000 0.656250
-vt 0.625000 0.937500
-vt 0.500000 0.937500
-vt 0.500000 0.656250
-vt 1.000003 0.656250
-vt 1.000002 0.937500
-vt 0.875000 0.937500
-vt 0.875000 0.656250
-vt 0.812500 0.656250
-vt 0.812500 0.937500
-vt 0.687500 0.937500
-vt 0.687500 0.656250
-vt 0.281250 0.593750
-vt 0.250000 0.656250
-vt 0.281250 1.000000
-vt 0.250000 0.937500
-vt 0.843750 0.593750
-vt 0.843750 1.000000
-vt 0.468750 0.593750
-vt 0.468750 1.000000
-vt 0.656250 0.593750
-vt 0.656250 1.000000
-vt 0.875000 0.593750
-vt 1.000003 0.593750
-vt 1.000002 1.000000
-vt 0.875000 1.000000
-vt 0.687500 0.593750
-vt 0.812500 0.593750
-vt 0.812500 1.000000
-vt 0.687500 1.000000
-vt 0.500000 0.593750
-vt 0.625000 0.593750
-vt 0.625000 1.000000
-vt 0.500000 1.000000
-vt 0.312500 0.593750
-vt 0.437500 0.593750
-vt 0.437500 1.000000
-vt 0.312500 1.000000
-vt 0.250000 1.000000
-vt 0.125000 1.000000
-vt 0.125000 0.875000
-vt 0.250000 0.875000
-vn 0.0000 0.0000 1.0000
-vn 1.0000 0.0000 0.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
+
+# vertices [38]
+
+v -0.03125 0.34375 -0.03125
+v -0.03125 0.09375 -0.03125
+v 0 0.09375 0
+v 0 0.34375 0
+v -0.03125 0.09375 0.03125
+v -0.03125 0.34375 0.03125
+v 0.03125 0.09375 0.03125
+v 0.03125 0.34375 0.03125
+v 0.03125 0.34375 -0.03125
+v 0.03125 0.09375 -0.03125
+v 0.0625 0.03125 0.09375
+v 0.0625 0.3125 0.09375
+v -0.0625 0.3125 0.09375
+v -0.0625 0.03125 0.09375
+v 0.09375 0.03125 -0.0625
+v 0.09375 0.3125 -0.0625
+v 0.09375 0.3125 0.0625
+v 0.09375 0.03125 0.0625
+v -0.09375 0.03125 0.0625
+v -0.09375 0.3125 0.0625
+v -0.09375 0.3125 -0.0625
+v -0.09375 0.03125 -0.0625
+v -0.0625 0.03125 -0.09375
+v -0.0625 0.3125 -0.09375
+v 0.0625 0.3125 -0.09375
+v 0.0625 0.03125 -0.09375
+v -0.0625 0 0.0625
+v -0.0625 0.34375 0.0625
+v -0.0625 0 -0.0625
+v -0.0625 0.34375 -0.0625
+v 0.0625 0 0.0625
+v 0.0625 0.34375 0.0625
+v 0.0625 0 -0.0625
+v 0.0625 0.34375 -0.0625
+v -0.0625 0.5 0.0625
+v -0.0625 0.5 -0.0625
+v 0.0625 0.5 -0.0625
+v 0.0625 0.5 0.0625
+
+# normals [26]
+
+vn -0.7071 0 0.7071
+vn -0.7071 0 -0.7071
+vn 0 0 1
+vn 1 0 0
+vn -1 0 0
+vn 0 0 -1
 vn -0.5774 -0.5774 0.5774
 vn -0.5774 0.5774 0.5774
 vn -0.5774 -0.5774 -0.5774
@@ -111,82 +60,133 @@ vn 0.5774 -0.5774 0.5774
 vn 0.5774 0.5774 0.5774
 vn 0.5774 -0.5774 -0.5774
 vn 0.5774 0.5774 -0.5774
-vn -0.7071 -0.7071 0.0000
-vn -0.7071 0.0000 0.7071
-vn -0.7071 0.7071 0.0000
-vn -0.7071 0.0000 -0.7071
-vn 0.0000 -0.7071 -0.7071
-vn 0.0000 0.7071 -0.7071
-vn 0.7071 0.0000 -0.7071
-vn 0.7071 -0.7071 0.0000
-vn 0.7071 0.7071 0.0000
-vn 0.7071 0.0000 0.7071
-vn 0.0000 -0.7071 0.7071
-vn 0.0000 0.7071 0.7071
-vn 0.0000 -1.0000 0.0000
-s off
-f 25/11/3 27/12/3 14/13/3 12/14/3
-f 31/15/4 33/16/4 28/17/4 24/18/4
-f 13/19/5 16/20/5 22/21/5 18/22/5
-f 19/23/6 21/24/6 34/25/6 30/26/6
-f 11/27/7 12/14/7 13/28/7
-f 14/13/8 15/29/8 16/30/8
-f 17/31/9 18/22/9 19/23/9
-f 20/32/10 21/24/10 22/21/10
-f 23/33/11 24/18/11 25/11/11
-f 26/34/12 27/12/12 28/17/12
-f 29/35/13 30/26/13 31/15/13
-f 32/36/14 33/16/14 34/25/14
-f 17/37/15 11/38/15 13/19/15 18/22/15
-f 12/14/16 14/13/16 16/30/16 13/28/16
-f 15/39/17 20/40/17 22/21/17 16/20/17
-f 21/24/18 19/23/18 18/22/18 22/21/18
-f 29/41/19 17/42/19 19/23/19 30/26/19
-f 20/43/20 32/44/20 34/25/20 21/24/20
-f 33/16/21 31/15/21 30/26/21 34/25/21
-f 23/45/22 29/46/22 31/15/22 24/18/22
-f 32/47/23 26/48/23 28/17/23 33/16/23
-f 27/12/24 25/11/24 24/18/24 28/17/24
-f 11/49/25 23/50/25 25/11/25 12/14/25
-f 26/51/26 15/52/26 14/13/26 27/12/26
-f 17/53/27 29/54/27 23/55/27 11/56/27
-o Cube.001_Cube.006
-v -0.062500 0.343750 0.062500
-v -0.062500 0.500000 0.062500
-v -0.062500 0.343750 -0.062500
-v -0.062500 0.500000 -0.062500
-v 0.062500 0.343750 0.062500
-v 0.062500 0.500000 0.062500
-v 0.062500 0.343750 -0.062500
-v 0.062500 0.500000 -0.062500
-vt 0.500000 0.000000
-vt 0.500000 0.156250
-vt 0.375000 0.156250
-vt 0.375000 0.000000
-vt 0.250000 0.156250
-vt 0.250000 0.000000
-vt 0.125000 0.156250
-vt 0.125000 0.000000
-vt 0.000000 0.156250
-vt 0.000000 0.000000
-vt 0.125000 0.156250
-vt 0.125000 0.281250
-vt 0.000000 0.281250
-vt 0.000000 0.156250
-vt 0.250000 0.281250
-vt 0.125000 0.281250
-vt 0.125000 0.156250
-vt 0.250000 0.156250
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-s off
-f 35/57/28 36/58/28 38/59/28 37/60/28
-f 37/60/29 38/59/29 42/61/29 41/62/29
-f 41/62/30 42/61/30 40/63/30 39/64/30
-f 39/64/31 40/63/31 36/65/31 35/66/31
-f 37/67/32 41/68/32 39/69/32 35/70/32
-f 42/71/33 38/72/33 36/73/33 40/74/33
+vn -0.7071 -0.7071 0
+vn -0.7071 0.7071 0
+vn 0 -0.7071 -0.7071
+vn 0 0.7071 -0.7071
+vn 0.7071 0 -0.7071
+vn 0.7071 -0.7071 0
+vn 0.7071 0.7071 0
+vn 0.7071 0 0.7071
+vn 0 -0.7071 0.7071
+vn 0 0.7071 0.7071
+vn 0 -1 0
+vn 0 1 0
+
+# uvs [65]
+
+vt 0 1
+vt 0 0.75
+vt 0.03125 0.75
+vt 0.03125 1
+vt 0.0625 0.75
+vt 0.0625 1
+vt 0.4375 0.65625
+vt 0.4375 0.9375
+vt 0.3125 0.9375
+vt 0.3125 0.65625
+vt 0.625 0.65625
+vt 0.625 0.9375
+vt 0.5 0.9375
+vt 0.5 0.65625
+vt 1 0.65625
+vt 1 0.9375
+vt 0.875 0.9375
+vt 0.875 0.65625
+vt 0.8125 0.65625
+vt 0.8125 0.9375
+vt 0.6875 0.9375
+vt 0.6875 0.65625
+vt 0.28125 0.59375
+vt 0.25 0.65625
+vt 0.28125 1
+vt 0.25 0.9375
+vt 0.84375 0.59375
+vt 0.84375 1
+vt 0.46875 0.59375
+vt 0.46875 1
+vt 0.65625 0.59375
+vt 0.65625 1
+vt 0.875 0.59375
+vt 1 0.59375
+vt 1 1
+vt 0.875 1
+vt 0.6875 0.59375
+vt 0.8125 0.59375
+vt 0.8125 1
+vt 0.6875 1
+vt 0.5 0.59375
+vt 0.625 0.59375
+vt 0.625 1
+vt 0.5 1
+vt 0.3125 0.59375
+vt 0.4375 0.59375
+vt 0.4375 1
+vt 0.3125 1
+vt 0.25 1
+vt 0.125 1
+vt 0.125 0.875
+vt 0.25 0.875
+vt 0.5 0
+vt 0.5 0.15625
+vt 0.375 0.15625
+vt 0.375 0
+vt 0.25 0.15625
+vt 0.25 0
+vt 0.125 0.15625
+vt 0.125 0
+vt 0 0.15625
+vt 0 0
+vt 0.125 0.28125
+vt 0 0.28125
+vt 0.25 0.28125
+
+# objects [3]
+
+g Light
+
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 5/5/2 6/6/2 4/4/2 3/3/2
+f 4/4/1 3/3/1 7/2/1 8/1/1
+f 3/3/2 4/4/2 9/6/2 10/5/2
+
+g Bulb
+
+s 1
+f 11/7/3 12/8/3 13/9/3 14/10/3
+f 15/11/4 16/12/4 17/13/4 18/14/4
+f 19/15/5 20/16/5 21/17/5 22/18/5
+f 23/19/6 24/20/6 25/21/6 26/22/6
+f 27/23/7 14/10/7 19/24/7
+f 13/9/8 28/25/8 20/26/8
+f 29/27/9 22/18/9 23/19/9
+f 30/28/10 24/20/10 21/17/10
+f 31/29/11 18/14/11 11/7/11
+f 32/30/12 12/8/12 17/13/12
+f 33/31/13 26/22/13 15/11/13
+f 34/32/14 16/12/14 25/21/14
+f 29/33/15 27/34/15 19/15/15 22/18/15
+f 14/10/1 13/9/1 20/26/1 19/24/1
+f 28/35/16 30/36/16 21/17/16 20/16/16
+f 24/20/2 23/19/2 22/18/2 21/17/2
+f 33/37/17 29/38/17 23/19/17 26/22/17
+f 30/39/18 34/40/18 25/21/18 24/20/18
+f 16/12/19 15/11/19 26/22/19 25/21/19
+f 31/41/20 33/42/20 15/11/20 18/14/20
+f 34/43/21 32/44/21 17/13/21 16/12/21
+f 12/8/22 11/7/22 18/14/22 17/13/22
+f 27/45/23 31/46/23 11/7/23 14/10/23
+f 32/47/24 28/48/24 13/9/24 12/8/24
+f 29/49/25 33/50/25 31/51/25 27/52/25
+
+g Base
+
+s 1
+f 28/53/5 35/54/5 36/55/5 30/56/5
+f 30/56/6 36/55/6 37/57/6 34/58/6
+f 34/58/4 37/57/4 38/59/4 32/60/4
+f 32/60/3 38/59/3 35/61/3 28/62/3
+f 30/59/25 34/63/25 32/64/25 28/61/25
+f 37/65/26 36/63/26 35/59/26 38/57/26
+
diff --git a/morelights_vintage/models/morelights_vintage_lantern_c.obj b/morelights_vintage/models/morelights_vintage_lantern_c.obj
index 27512d1..1be6447 100644
--- a/morelights_vintage/models/morelights_vintage_lantern_c.obj
+++ b/morelights_vintage/models/morelights_vintage_lantern_c.obj
@@ -1,105 +1,101 @@
-# Blender v2.79 (sub 0) OBJ File: 'vintage_lantern_ceiling.blend'
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T19:35:50Z | https://github.com/jonnenauha/obj-simplify
+
+# Blender v2.93.0 OBJ File: ''
 # www.blender.org
-o Cube.003
-v -0.125000 0.000000 0.125000
-v -0.125000 0.375000 0.125000
-v -0.125000 0.000000 -0.125000
-v -0.125000 0.375000 -0.125000
-v 0.125000 0.000000 0.125000
-v 0.125000 0.375000 0.125000
-v 0.125000 0.000000 -0.125000
-v 0.125000 0.375000 -0.125000
-vt 0.750000 0.500000
-vt 0.750000 0.875000
-vt 0.500000 0.875000
-vt 0.500000 0.500000
-vt 0.250000 0.875000
-vt 0.250000 0.500000
-vt 0.000000 0.875000
-vt 0.000000 0.500000
-vt 1.000000 0.500000
-vt 1.000000 0.875000
-vt 0.750000 0.250000
-vt 1.000000 0.250000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 -1.0000 0.0000
-g Cube.003_Cube.003_Material.001
-s off
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 3/4/2 4/3/2 8/5/2 7/6/2
-f 7/6/3 8/5/3 6/7/3 5/8/3
-f 5/9/4 6/10/4 2/2/4 1/1/4
-f 3/11/5 7/12/5 5/9/5 1/1/5
-o Cube.001
-v -0.156250 0.375000 0.156250
-v -0.156250 0.437500 0.156250
-v -0.156250 0.375000 -0.156250
-v -0.156250 0.437500 -0.156250
-v 0.156250 0.375000 0.156250
-v 0.156250 0.437500 0.156250
-v 0.156250 0.375000 -0.156250
-v 0.156250 0.437500 -0.156250
-v -0.062500 0.437500 0.062500
-v -0.062500 0.500000 0.062500
-v -0.062500 0.437500 -0.062500
-v -0.062500 0.500000 -0.062500
-v 0.062500 0.437500 0.062500
-v 0.062500 0.500000 0.062500
-v 0.062500 0.437500 -0.062500
-v 0.062500 0.500000 -0.062500
-vt 0.500000 0.875000
-vt 0.500000 0.812500
-vt 0.812500 0.812500
-vt 0.812500 0.875000
-vt 0.812500 0.812500
-vt 0.812500 0.875000
-vt 0.500000 0.875000
-vt 0.500000 0.812500
-vt 0.187500 0.875000
-vt 0.187500 0.812500
-vt 0.187500 0.875000
-vt 0.187500 0.812500
-vt 0.500000 0.812500
-vt 0.187500 0.812500
-vt 0.187500 0.500000
-vt 0.500000 0.500000
-vt 0.500000 0.500000
-vt 0.500000 0.812500
-vt 0.187500 0.812500
-vt 0.187500 0.500000
-vt 1.000000 0.375000
-vt 1.000000 0.437500
-vt 0.875000 0.437500
-vt 0.875000 0.375000
-vt 0.750000 0.437500
-vt 0.750000 0.375000
-vt 0.625000 0.437500
-vt 0.625000 0.375000
-vt 0.500000 0.437500
-vt 0.500000 0.375000
-vt 0.625000 0.625000
-vt 0.500000 0.625000
-vt 0.500000 0.500000
-vt 0.625000 0.500000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-g Cube.001_Cube.001_Material.000
-s off
-f 9/13/6 10/14/6 12/15/6 11/16/6
-f 11/17/7 12/18/7 16/19/7 15/20/7
-f 15/20/8 16/19/8 14/21/8 13/22/8
-f 13/23/9 14/24/9 10/14/9 9/13/9
-f 11/25/10 15/26/10 13/27/10 9/28/10
-f 16/29/11 12/30/11 10/31/11 14/32/11
-f 17/33/6 18/34/6 20/35/6 19/36/6
-f 19/36/7 20/35/7 24/37/7 23/38/7
-f 23/38/8 24/37/8 22/39/8 21/40/8
-f 21/40/9 22/39/9 18/41/9 17/42/9
-f 24/43/11 20/44/11 18/45/11 22/46/11
+
+# vertices [24]
+
+v -0.125 0 0.125
+v -0.125 0.375 0.125
+v -0.125 0.375 -0.125
+v -0.125 0 -0.125
+v 0.125 0.375 -0.125
+v 0.125 0 -0.125
+v 0.125 0.375 0.125
+v 0.125 0 0.125
+v -0.15625 0.375 0.15625
+v -0.15625 0.4375 0.15625
+v -0.15625 0.4375 -0.15625
+v -0.15625 0.375 -0.15625
+v 0.15625 0.4375 -0.15625
+v 0.15625 0.375 -0.15625
+v 0.15625 0.4375 0.15625
+v 0.15625 0.375 0.15625
+v -0.0625 0.4375 0.0625
+v -0.0625 0.5 0.0625
+v -0.0625 0.5 -0.0625
+v -0.0625 0.4375 -0.0625
+v 0.0625 0.5 -0.0625
+v 0.0625 0.4375 -0.0625
+v 0.0625 0.5 0.0625
+v 0.0625 0.4375 0.0625
+
+# normals [6]
+
+vn -1 0 0
+vn 0 0 -1
+vn 1 0 0
+vn 0 0 1
+vn 0 -1 0
+vn 0 1 0
+
+# uvs [31]
+
+vt 0.75 0.5
+vt 0.75 0.875
+vt 0.5 0.875
+vt 0.5 0.5
+vt 0.25 0.875
+vt 0.25 0.5
+vt 0 0.875
+vt 0 0.5
+vt 1 0.5
+vt 1 0.875
+vt 0.75 0.25
+vt 1 0.25
+vt 0.5 0.8125
+vt 0.8125 0.8125
+vt 0.8125 0.875
+vt 0.1875 0.875
+vt 0.1875 0.8125
+vt 0.1875 0.5
+vt 1 0.375
+vt 1 0.4375
+vt 0.875 0.4375
+vt 0.875 0.375
+vt 0.75 0.4375
+vt 0.75 0.375
+vt 0.625 0.4375
+vt 0.625 0.375
+vt 0.5 0.4375
+vt 0.5 0.375
+vt 0.625 0.625
+vt 0.5 0.625
+vt 0.625 0.5
+
+# objects [2]
+
+g LanternGlobe
+
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 4/4/2 3/3/2 5/5/2 6/6/2
+f 6/6/3 5/5/3 7/7/3 8/8/3
+f 8/9/4 7/10/4 2/2/4 1/1/4
+f 4/11/5 6/12/5 8/9/5 1/1/5
+
+g LanternMetal
+
+s 1
+f 9/3/1 10/13/1 11/14/1 12/15/1
+f 12/14/2 11/15/2 13/3/2 14/13/2
+f 14/13/3 13/3/3 15/16/3 16/17/3
+f 16/16/4 15/17/4 10/13/4 9/3/4
+f 12/13/5 14/17/5 16/18/5 9/4/5
+f 13/4/6 11/13/6 10/17/6 15/18/6
+f 17/19/1 18/20/1 19/21/1 20/22/1
+f 20/22/2 19/21/2 21/23/2 22/24/2
+f 22/24/3 21/23/3 23/25/3 24/26/3
+f 24/26/4 23/25/4 18/27/4 17/28/4
+f 21/29/6 19/30/6 18/4/6 23/31/6
+
diff --git a/morelights_vintage/models/morelights_vintage_lantern_f.obj b/morelights_vintage/models/morelights_vintage_lantern_f.obj
index 8f07e1c..9dadd56 100644
--- a/morelights_vintage/models/morelights_vintage_lantern_f.obj
+++ b/morelights_vintage/models/morelights_vintage_lantern_f.obj
@@ -1,131 +1,118 @@
-# Blender v2.79 (sub 0) OBJ File: 'vintage_lantern.blend'
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T19:37:30Z | https://github.com/jonnenauha/obj-simplify
+
+# Blender v2.93.0 OBJ File: ''
 # www.blender.org
-o Cube.003
-v -0.125000 -0.437500 0.125000
-v -0.125000 -0.062500 0.125000
-v -0.125000 -0.437500 -0.125000
-v -0.125000 -0.062500 -0.125000
-v 0.125000 -0.437500 0.125000
-v 0.125000 -0.062500 0.125000
-v 0.125000 -0.437500 -0.125000
-v 0.125000 -0.062500 -0.125000
-vt 0.750000 0.500000
-vt 0.750000 0.875000
-vt 0.500000 0.875000
-vt 0.500000 0.500000
-vt 0.250000 0.875000
-vt 0.250000 0.500000
-vt 0.000000 0.875000
-vt 0.000000 0.500000
-vt 1.000000 0.500000
-vt 1.000000 0.875000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-g Cube.003_Cube.003_Material.001
-s off
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 3/4/2 4/3/2 8/5/2 7/6/2
-f 7/6/3 8/5/3 6/7/3 5/8/3
-f 5/9/4 6/10/4 2/2/4 1/1/4
-o Cube.001
-v -0.156250 -0.500000 0.156250
-v -0.156250 -0.437500 0.156250
-v -0.156250 -0.500000 -0.156250
-v -0.156250 -0.437500 -0.156250
-v 0.156250 -0.500000 0.156250
-v 0.156250 -0.437500 0.156250
-v 0.156250 -0.500000 -0.156250
-v 0.156250 -0.437500 -0.156250
-v -0.156250 -0.062500 0.156250
-v -0.156250 0.000000 0.156250
-v -0.156250 -0.062500 -0.156250
-v -0.156250 0.000000 -0.156250
-v 0.156250 -0.062500 0.156250
-v 0.156250 0.000000 0.156250
-v 0.156250 -0.062500 -0.156250
-v 0.156250 0.000000 -0.156250
-v -0.062500 0.000000 0.062500
-v -0.062500 0.062500 0.062500
-v -0.062500 0.000000 -0.062500
-v -0.062500 0.062500 -0.062500
-v 0.062500 0.000000 0.062500
-v 0.062500 0.062500 0.062500
-v 0.062500 0.000000 -0.062500
-v 0.062500 0.062500 -0.062500
-vt 0.500000 0.187500
-vt 0.500000 0.125000
-vt 0.812500 0.125000
-vt 0.812500 0.187500
-vt 0.812500 0.125000
-vt 0.812500 0.187500
-vt 0.500000 0.187500
-vt 0.500000 0.125000
-vt 0.187500 0.187500
-vt 0.187500 0.125000
-vt 0.187500 0.187500
-vt 0.187500 0.125000
-vt 0.500000 0.500000
-vt 0.187500 0.500000
-vt 0.500000 0.500000
-vt 0.187500 0.500000
-vt 0.500000 0.875000
-vt 0.500000 0.812500
-vt 0.812500 0.812500
-vt 0.812500 0.875000
-vt 0.812500 0.812500
-vt 0.812500 0.875000
-vt 0.500000 0.875000
-vt 0.500000 0.812500
-vt 0.187500 0.875000
-vt 0.187500 0.812500
-vt 0.187500 0.875000
-vt 0.187500 0.812500
-vt 0.500000 0.812500
-vt 0.187500 0.812500
-vt 0.187500 0.500000
-vt 0.500000 0.500000
-vt 0.500000 0.500000
-vt 0.500000 0.812500
-vt 0.187500 0.812500
-vt 0.187500 0.500000
-vt 1.000000 0.375000
-vt 1.000000 0.437500
-vt 0.875000 0.437500
-vt 0.875000 0.375000
-vt 0.750000 0.437500
-vt 0.750000 0.375000
-vt 0.625000 0.437500
-vt 0.625000 0.375000
-vt 0.500000 0.437500
-vt 0.500000 0.375000
-vt 0.625000 0.625000
-vt 0.500000 0.625000
-vt 0.500000 0.500000
-vt 0.625000 0.500000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-g Cube.001_Cube.001_Material.000
-s off
-f 9/11/5 10/12/5 12/13/5 11/14/5
-f 11/15/6 12/16/6 16/17/6 15/18/6
-f 15/18/7 16/17/7 14/19/7 13/20/7
-f 13/21/8 14/22/8 10/12/8 9/11/8
-f 11/23/9 15/24/9 13/21/9 9/11/9
-f 16/17/10 12/25/10 10/26/10 14/19/10
-f 17/27/5 18/28/5 20/29/5 19/30/5
-f 19/31/6 20/32/6 24/33/6 23/34/6
-f 23/34/7 24/33/7 22/35/7 21/36/7
-f 21/37/8 22/38/8 18/28/8 17/27/8
-f 19/39/9 23/40/9 21/41/9 17/42/9
-f 24/43/10 20/44/10 18/45/10 22/46/10
-f 25/47/5 26/48/5 28/49/5 27/50/5
-f 27/50/6 28/49/6 32/51/6 31/52/6
-f 31/52/7 32/51/7 30/53/7 29/54/7
-f 29/54/8 30/53/8 26/55/8 25/56/8
-f 32/57/10 28/58/10 26/59/10 30/60/10
+
+# vertices [32]
+
+v -0.125 -0.4375 0.125
+v -0.125 -0.0625 0.125
+v -0.125 -0.0625 -0.125
+v -0.125 -0.4375 -0.125
+v 0.125 -0.0625 -0.125
+v 0.125 -0.4375 -0.125
+v 0.125 -0.0625 0.125
+v 0.125 -0.4375 0.125
+v -0.15625 -0.5 0.15625
+v -0.15625 -0.4375 0.15625
+v -0.15625 -0.4375 -0.15625
+v -0.15625 -0.5 -0.15625
+v 0.15625 -0.4375 -0.15625
+v 0.15625 -0.5 -0.15625
+v 0.15625 -0.4375 0.15625
+v 0.15625 -0.5 0.15625
+v -0.15625 -0.0625 0.15625
+v -0.15625 0 0.15625
+v -0.15625 0 -0.15625
+v -0.15625 -0.0625 -0.15625
+v 0.15625 0 -0.15625
+v 0.15625 -0.0625 -0.15625
+v 0.15625 0 0.15625
+v 0.15625 -0.0625 0.15625
+v -0.0625 0 0.0625
+v -0.0625 0.0625 0.0625
+v -0.0625 0.0625 -0.0625
+v -0.0625 0 -0.0625
+v 0.0625 0.0625 -0.0625
+v 0.0625 0 -0.0625
+v 0.0625 0.0625 0.0625
+v 0.0625 0 0.0625
+
+# normals [6]
+
+vn -1 0 0
+vn 0 0 -1
+vn 1 0 0
+vn 0 0 1
+vn 0 -1 0
+vn 0 1 0
+
+# uvs [35]
+
+vt 0.75 0.5
+vt 0.75 0.875
+vt 0.5 0.875
+vt 0.5 0.5
+vt 0.25 0.875
+vt 0.25 0.5
+vt 0 0.875
+vt 0 0.5
+vt 1 0.5
+vt 1 0.875
+vt 0.5 0.1875
+vt 0.5 0.125
+vt 0.8125 0.125
+vt 0.8125 0.1875
+vt 0.1875 0.1875
+vt 0.1875 0.125
+vt 0.1875 0.5
+vt 0.5 0.8125
+vt 0.8125 0.8125
+vt 0.8125 0.875
+vt 0.1875 0.875
+vt 0.1875 0.8125
+vt 1 0.375
+vt 1 0.4375
+vt 0.875 0.4375
+vt 0.875 0.375
+vt 0.75 0.4375
+vt 0.75 0.375
+vt 0.625 0.4375
+vt 0.625 0.375
+vt 0.5 0.4375
+vt 0.5 0.375
+vt 0.625 0.625
+vt 0.5 0.625
+vt 0.625 0.5
+
+# objects [2]
+
+g LanternGlobe
+
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 4/4/2 3/3/2 5/5/2 6/6/2
+f 6/6/3 5/5/3 7/7/3 8/8/3
+f 8/9/4 7/10/4 2/2/4 1/1/4
+
+g LanternMetal
+
+s 1
+f 9/11/1 10/12/1 11/13/1 12/14/1
+f 12/13/2 11/14/2 13/11/2 14/12/2
+f 14/12/3 13/11/3 15/15/3 16/16/3
+f 16/15/4 15/16/4 10/12/4 9/11/4
+f 12/4/5 14/17/5 16/15/5 9/11/5
+f 13/11/6 11/4/6 10/17/6 15/15/6
+f 17/3/1 18/18/1 19/19/1 20/20/1
+f 20/19/2 19/20/2 21/3/2 22/18/2
+f 22/18/3 21/3/3 23/21/3 24/22/3
+f 24/21/4 23/22/4 18/18/4 17/3/4
+f 20/18/5 22/22/5 24/17/5 17/4/5
+f 21/4/6 19/18/6 18/22/6 23/17/6
+f 25/23/1 26/24/1 27/25/1 28/26/1
+f 28/26/2 27/25/2 29/27/2 30/28/2
+f 30/28/3 29/27/3 31/29/3 32/30/3
+f 32/30/4 31/29/4 26/31/4 25/32/4
+f 29/33/6 27/34/6 26/4/6 31/35/6
+
diff --git a/morelights_vintage/models/morelights_vintage_lantern_w.obj b/morelights_vintage/models/morelights_vintage_lantern_w.obj
index ceb48b1..5195b98 100644
--- a/morelights_vintage/models/morelights_vintage_lantern_w.obj
+++ b/morelights_vintage/models/morelights_vintage_lantern_w.obj
@@ -1,142 +1,136 @@
-# Blender v2.79 (sub 0) OBJ File: 'vintage_lantern_wall2_merged.blend'
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T19:39:42Z | https://github.com/jonnenauha/obj-simplify
+
+# Blender v2.93.0 OBJ File: ''
 # www.blender.org
-o Cube.003
-v -0.125000 -0.187500 -0.312500
-v -0.125000 -0.187500 0.062500
-v -0.125000 0.062500 -0.312500
-v -0.125000 0.062500 0.062500
-v 0.125000 -0.187500 -0.312500
-v 0.125000 -0.187500 0.062500
-v 0.125000 0.062500 -0.312500
-v 0.125000 0.062500 0.062500
-v -0.000000 -0.437500 0.312500
-v 0.000000 -0.437500 0.062500
-v -0.000000 0.062500 0.312500
-v 0.000000 0.062500 0.062500
-vt 0.750000 0.500000
-vt 0.750000 0.875000
-vt 0.500000 0.875000
-vt 0.500000 0.500000
-vt 0.250000 0.875000
-vt 0.250000 0.500000
-vt 0.000000 0.875000
-vt 0.000000 0.500000
-vt 1.000000 0.500000
-vt 1.000000 0.875000
-vt 0.000000 0.500000
-vt 0.000000 0.250000
-vt 0.500000 0.250000
-vt 0.500000 0.500000
-vt 0.750000 0.250000
-vt 1.000000 0.250000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 1.0000 0.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-g Cube.003_Cube.003_Material.001
-s off
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 3/4/2 4/3/2 8/5/2 7/6/2
-f 7/6/3 8/5/3 6/7/3 5/8/3
-f 5/9/4 6/10/4 2/2/4 1/1/4
-f 9/11/3 10/12/3 12/13/3 11/14/3
-f 3/15/5 7/16/5 5/9/5 1/1/5
-o Cube.001
-v -0.156250 -0.218750 0.062500
-v -0.156250 -0.218750 0.125000
-v -0.156250 0.093750 0.062500
-v -0.156250 0.093750 0.125000
-v 0.156250 -0.218750 0.062500
-v 0.156250 -0.218750 0.125000
-v 0.156250 0.093750 0.062500
-v 0.156250 0.093750 0.125000
-v -0.062500 -0.125000 0.125000
-v -0.062500 -0.125000 0.187500
-v -0.062500 -0.000000 0.125000
-v -0.062500 -0.000000 0.187500
-v 0.062500 -0.125000 0.125000
-v 0.062500 -0.125000 0.187500
-v 0.062500 -0.000000 0.125000
-v 0.062500 -0.000000 0.187500
-v 0.125000 -0.500000 -0.125000
-v 0.125000 -0.500000 0.375000
-v -0.125000 -0.500000 -0.125000
-v -0.125000 -0.500000 0.375000
-v 0.125000 -0.437500 -0.125000
-v 0.125000 -0.437500 0.375000
-v -0.125000 -0.437500 -0.125000
-v -0.125000 -0.437500 0.375000
-vt 0.500000 0.875000
-vt 0.500000 0.812500
-vt 0.812500 0.812500
-vt 0.812500 0.875000
-vt 0.812500 0.812500
-vt 0.812500 0.875000
-vt 0.500000 0.875000
-vt 0.500000 0.812500
-vt 0.187500 0.875000
-vt 0.187500 0.812500
-vt 0.187500 0.875000
-vt 0.187500 0.812500
-vt 0.500000 0.812500
-vt 0.187500 0.812500
-vt 0.187500 0.500000
-vt 0.500000 0.500000
-vt 0.500000 0.500000
-vt 0.500000 0.812500
-vt 0.187500 0.812500
-vt 0.187500 0.500000
-vt 1.000000 0.375000
-vt 1.000000 0.437500
-vt 0.875000 0.437500
-vt 0.875000 0.375000
-vt 0.750000 0.437500
-vt 0.750000 0.375000
-vt 0.625000 0.437500
-vt 0.625000 0.375000
-vt 0.500000 0.437500
-vt 0.500000 0.375000
-vt 0.625000 0.625000
-vt 0.500000 0.625000
-vt 0.500000 0.500000
-vt 0.625000 0.500000
-vt 0.937500 0.250000
-vt 0.937500 0.750000
-vt 0.687500 0.750000
-vt 0.687500 0.250000
-vt 0.625000 0.750000
-vt 0.625000 0.250000
-vt 0.375000 0.750000
-vt 0.375000 0.250000
-vt 0.312500 0.750000
-vt 0.312500 0.250000
-vt 0.687500 0.187500
-vt 0.937500 0.187500
-vt 0.687500 0.812500
-vt 0.937500 0.812500
-vn -1.0000 0.0000 0.0000
-vn 0.0000 1.0000 0.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 0.0000 1.0000
-g Cube.001_Cube.001_Material.000
-s off
-f 13/17/6 14/18/6 16/19/6 15/20/6
-f 15/21/7 16/22/7 20/23/7 19/24/7
-f 19/24/8 20/23/8 18/25/8 17/26/8
-f 17/27/9 18/28/9 14/18/9 13/17/9
-f 15/29/10 19/30/10 17/31/10 13/32/10
-f 20/33/11 16/34/11 14/35/11 18/36/11
-f 21/37/6 22/38/6 24/39/6 23/40/6
-f 23/40/7 24/39/7 28/41/7 27/42/7
-f 27/42/8 28/41/8 26/43/8 25/44/8
-f 25/44/9 26/43/9 22/45/9 21/46/9
-f 28/47/11 24/48/11 22/49/11 26/50/11
-f 29/51/9 30/52/9 32/53/9 31/54/9
-f 31/54/6 32/53/6 36/55/6 35/56/6
-f 35/56/7 36/55/7 34/57/7 33/58/7
-f 33/58/8 34/57/8 30/59/8 29/60/8
-f 31/54/10 35/61/10 33/62/10 29/51/10
-f 36/63/11 32/53/11 30/52/11 34/64/11
+
+# vertices [36]
+
+v -0.125 -0.1875 -0.3125
+v -0.125 -0.1875 0.0625
+v -0.125 0.0625 0.0625
+v -0.125 0.0625 -0.3125
+v 0.125 0.0625 0.0625
+v 0.125 0.0625 -0.3125
+v 0.125 -0.1875 0.0625
+v 0.125 -0.1875 -0.3125
+v 0 -0.4375 0.3125
+v 0 -0.4375 0.0625
+v 0 0.0625 0.0625
+v 0 0.0625 0.3125
+v -0.15625 -0.21875 0.0625
+v -0.15625 -0.21875 0.125
+v -0.15625 0.09375 0.125
+v -0.15625 0.09375 0.0625
+v 0.15625 0.09375 0.125
+v 0.15625 0.09375 0.0625
+v 0.15625 -0.21875 0.125
+v 0.15625 -0.21875 0.0625
+v -0.0625 -0.125 0.125
+v -0.0625 -0.125 0.1875
+v -0.0625 0 0.1875
+v -0.0625 0 0.125
+v 0.0625 0 0.1875
+v 0.0625 0 0.125
+v 0.0625 -0.125 0.1875
+v 0.0625 -0.125 0.125
+v 0.125 -0.5 -0.125
+v 0.125 -0.5 0.375
+v -0.125 -0.5 0.375
+v -0.125 -0.5 -0.125
+v -0.125 -0.4375 0.375
+v -0.125 -0.4375 -0.125
+v 0.125 -0.4375 0.375
+v 0.125 -0.4375 -0.125
+
+# normals [6]
+
+vn -1 0 0
+vn 0 1 0
+vn 1 0 0
+vn 0 -1 0
+vn 0 0 -1
+vn 0 0 1
+
+# uvs [47]
+
+vt 0.75 0.5
+vt 0.75 0.875
+vt 0.5 0.875
+vt 0.5 0.5
+vt 0.25 0.875
+vt 0.25 0.5
+vt 0 0.875
+vt 0 0.5
+vt 1 0.5
+vt 1 0.875
+vt 0 0.25
+vt 0.5 0.25
+vt 0.75 0.25
+vt 1 0.25
+vt 0.5 0.8125
+vt 0.8125 0.8125
+vt 0.8125 0.875
+vt 0.1875 0.875
+vt 0.1875 0.8125
+vt 0.1875 0.5
+vt 1 0.375
+vt 1 0.4375
+vt 0.875 0.4375
+vt 0.875 0.375
+vt 0.75 0.4375
+vt 0.75 0.375
+vt 0.625 0.4375
+vt 0.625 0.375
+vt 0.5 0.4375
+vt 0.5 0.375
+vt 0.625 0.625
+vt 0.5 0.625
+vt 0.625 0.5
+vt 0.9375 0.25
+vt 0.9375 0.75
+vt 0.6875 0.75
+vt 0.6875 0.25
+vt 0.625 0.75
+vt 0.625 0.25
+vt 0.375 0.75
+vt 0.375 0.25
+vt 0.3125 0.75
+vt 0.3125 0.25
+vt 0.6875 0.1875
+vt 0.9375 0.1875
+vt 0.6875 0.8125
+vt 0.9375 0.8125
+
+# objects [2]
+
+g Lantern
+
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 4/4/2 3/3/2 5/5/2 6/6/2
+f 6/6/3 5/5/3 7/7/3 8/8/3
+f 8/9/4 7/10/4 2/2/4 1/1/4
+f 9/8/3 10/11/3 11/12/3 12/4/3
+f 4/13/5 6/14/5 8/9/5 1/1/5
+
+g LanternMetal
+
+s 1
+f 13/3/1 14/15/1 15/16/1 16/17/1
+f 16/16/2 15/17/2 17/3/2 18/15/2
+f 18/15/3 17/3/3 19/18/3 20/19/3
+f 20/18/4 19/19/4 14/15/4 13/3/4
+f 16/15/5 18/19/5 20/20/5 13/4/5
+f 17/4/6 15/15/6 14/19/6 19/20/6
+f 21/21/1 22/22/1 23/23/1 24/24/1
+f 24/24/2 23/23/2 25/25/2 26/26/2
+f 26/26/3 25/25/3 27/27/3 28/28/3
+f 28/28/4 27/27/4 22/29/4 21/30/4
+f 25/31/6 23/32/6 22/4/6 27/33/6
+f 29/34/4 30/35/4 31/36/4 32/37/4
+f 32/37/1 31/36/1 33/38/1 34/39/1
+f 34/39/2 33/38/2 35/40/2 36/41/2
+f 36/41/3 35/40/3 30/42/3 29/43/3
+f 32/37/5 34/44/5 36/45/5 29/34/5
+f 33/46/6 31/36/6 30/35/6 35/47/6
+
diff --git a/morelights_vintage/models/morelights_vintage_oillamp.obj b/morelights_vintage/models/morelights_vintage_oillamp.obj
index de84b17..c5a3237 100644
--- a/morelights_vintage/models/morelights_vintage_oillamp.obj
+++ b/morelights_vintage/models/morelights_vintage_oillamp.obj
@@ -1,169 +1,156 @@
-# Blender v2.79 (sub 0) OBJ File: 'vintage_oillamp.blend'
+# Processed with obj-simplify v1.1 (a2f5cd9) | 2021-08-06T20:28:11Z | https://github.com/jonnenauha/obj-simplify
+
+# Blender v2.93.0 OBJ File: ''
 # www.blender.org
-o Plane
-v -0.031250 -0.468750 -0.031250
-v 0.031250 -0.468750 0.031250
-v -0.031250 0.031250 -0.031250
-v 0.031250 0.031250 0.031250
-v 0.031250 -0.468750 -0.031250
-v -0.031250 -0.468750 0.031250
-v 0.031250 0.031250 -0.031250
-v -0.031250 0.031250 0.031250
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt 0.000000 1.000000
-vt -0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 1.000000
-vt -0.000000 1.000000
-vn -0.7071 -0.0000 0.7071
-vn -0.7071 -0.0000 -0.7071
-g Plane_Plane_Material.003
-s off
-f 1/1/1 2/2/1 4/3/1 3/4/1
-f 5/5/2 6/6/2 8/7/2 7/8/2
-o Cube.001
-v -0.125000 -0.499000 0.125000
-v -0.125000 -0.343750 0.125000
-v -0.125000 -0.499000 -0.125000
-v -0.125000 -0.343750 -0.125000
-v 0.125000 -0.499000 0.125000
-v 0.125000 -0.343750 0.125000
-v 0.125000 -0.499000 -0.125000
-v 0.125000 -0.343750 -0.125000
-v -0.125000 -0.218750 0.125000
-v -0.125000 0.250000 0.125000
-v -0.125000 -0.218750 -0.125000
-v -0.125000 0.250000 -0.125000
-v 0.125000 -0.218750 0.125000
-v 0.125000 0.250000 0.125000
-v 0.125000 -0.218750 -0.125000
-v 0.125000 0.250000 -0.125000
-vt 0.750000 0.000000
-vt 0.750000 0.156250
-vt 0.500000 0.156250
-vt 0.500000 0.000000
-vt 0.250000 0.156250
-vt 0.250000 0.000000
-vt 0.000000 0.156250
-vt 0.000000 0.000000
-vt 1.000000 0.000000
-vt 1.000000 0.156250
-vt 0.250000 0.406250
-vt 0.000000 0.406250
-vt 0.000000 0.156250
-vt 0.250000 0.156250
-vt 0.750000 0.406250
-vt 0.750000 0.875000
-vt 0.500000 0.875000
-vt 0.500000 0.406250
-vt 0.250000 0.875000
-vt 0.250000 0.406250
-vt 0.000000 0.875000
-vt 0.000000 0.406250
-vt 1.000000 0.406250
-vt 1.000000 0.875000
-vt 0.500000 0.406250
-vt 0.250000 0.406250
-vt 0.250000 0.156250
-vt 0.500000 0.156250
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 -1.0000
-vn 1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-g Cube.001_Cube.001_Material.002
-s off
-f 9/9/3 10/10/3 12/11/3 11/12/3
-f 11/12/4 12/11/4 16/13/4 15/14/4
-f 15/14/5 16/13/5 14/15/5 13/16/5
-f 13/17/6 14/18/6 10/10/6 9/9/6
-f 11/19/7 15/20/7 13/21/7 9/22/7
-f 17/23/3 18/24/3 20/25/3 19/26/3
-f 19/26/4 20/25/4 24/27/4 23/28/4
-f 23/28/5 24/27/5 22/29/5 21/30/5
-f 21/31/6 22/32/6 18/24/6 17/23/6
-f 18/33/8 22/34/8 24/35/8 20/36/8
-o Cube
-v 0.062500 -0.312500 -0.062500
-v 0.062500 -0.312500 0.062500
-v -0.062500 -0.312500 0.062500
-v -0.062500 -0.312500 -0.062500
-v 0.062500 -0.250000 -0.062500
-v 0.062500 -0.250000 0.062500
-v -0.062500 -0.250000 0.062500
-v -0.062500 -0.250000 -0.062500
-v -0.125000 -0.343750 0.125000
-v -0.125000 -0.312500 0.125000
-v -0.125000 -0.343750 -0.125000
-v -0.125000 -0.312500 -0.125000
-v 0.125000 -0.343750 0.125000
-v 0.125000 -0.312500 0.125000
-v 0.125000 -0.343750 -0.125000
-v 0.125000 -0.312500 -0.125000
-v -0.125000 -0.250000 0.125000
-v -0.125000 -0.218750 0.125000
-v -0.125000 -0.250000 -0.125000
-v -0.125000 -0.218750 -0.125000
-v 0.125000 -0.250000 0.125000
-v 0.125000 -0.218750 0.125000
-v 0.125000 -0.250000 -0.125000
-v 0.125000 -0.218750 -0.125000
-vt 0.625000 0.531250
-vt 0.625000 0.468750
-vt 0.750000 0.468750
-vt 0.750000 0.531250
-vt 0.250000 0.531250
-vt 0.250000 0.468750
-vt 0.375000 0.468750
-vt 0.375000 0.531250
-vt 0.500000 0.468750
-vt 0.500000 0.531250
-vt 0.250000 0.781250
-vt 0.250000 0.750000
-vt 0.500000 0.750000
-vt 0.500000 0.781250
-vt 0.750000 0.750000
-vt 0.750000 0.781250
-vt 1.000000 0.750000
-vt 1.000000 0.781250
-vt 0.000000 0.781250
-vt 0.000000 0.750000
-vt 0.000000 0.500000
-vt 0.250000 0.500000
-vt 0.250000 0.250000
-vt 0.250000 0.218750
-vt 0.500000 0.218750
-vt 0.500000 0.250000
-vt 0.750000 0.218750
-vt 0.750000 0.250000
-vt 1.000000 0.218750
-vt 1.000000 0.250000
-vt 0.000000 0.250000
-vt 0.000000 0.218750
-vt 0.250000 0.500000
-vt 0.000000 0.500000
-vn 1.0000 0.0000 0.0000
-vn -0.0000 -0.0000 1.0000
-vn -1.0000 -0.0000 -0.0000
-vn 0.0000 0.0000 -1.0000
-vn 0.0000 1.0000 0.0000
-vn 0.0000 -1.0000 0.0000
-g Cube_Cube_Material
-s off
-f 25/37/9 29/38/9 30/39/9 26/40/9
-f 26/41/10 30/42/10 31/43/10 27/44/10
-f 27/44/11 31/43/11 32/45/11 28/46/11
-f 29/38/12 25/37/12 28/46/12 32/45/12
-f 33/47/11 34/48/11 36/49/11 35/50/11
-f 35/50/12 36/49/12 40/51/12 39/52/12
-f 39/52/9 40/51/9 38/53/9 37/54/9
-f 37/55/10 38/56/10 34/48/10 33/47/10
-f 34/48/13 38/56/13 40/57/13 36/58/13
-f 41/59/11 42/60/11 44/61/11 43/62/11
-f 43/62/12 44/61/12 48/63/12 47/64/12
-f 47/64/9 48/63/9 46/65/9 45/66/9
-f 45/67/10 46/68/10 42/60/10 41/59/10
-f 43/69/14 47/70/14 45/67/14 41/59/14
+
+# vertices [40]
+
+v -0.03125 -0.46875 -0.03125
+v 0.03125 -0.46875 0.03125
+v 0.03125 0.03125 0.03125
+v -0.03125 0.03125 -0.03125
+v 0.03125 -0.46875 -0.03125
+v -0.03125 -0.46875 0.03125
+v -0.03125 0.03125 0.03125
+v 0.03125 0.03125 -0.03125
+v -0.125 -0.499 0.125
+v -0.125 -0.34375 0.125
+v -0.125 -0.34375 -0.125
+v -0.125 -0.499 -0.125
+v 0.125 -0.34375 -0.125
+v 0.125 -0.499 -0.125
+v 0.125 -0.34375 0.125
+v 0.125 -0.499 0.125
+v -0.125 -0.21875 0.125
+v -0.125 0.25 0.125
+v -0.125 0.25 -0.125
+v -0.125 -0.21875 -0.125
+v 0.125 0.25 -0.125
+v 0.125 -0.21875 -0.125
+v 0.125 0.25 0.125
+v 0.125 -0.21875 0.125
+v 0.0625 -0.3125 -0.0625
+v 0.0625 -0.25 -0.0625
+v 0.0625 -0.25 0.0625
+v 0.0625 -0.3125 0.0625
+v -0.0625 -0.25 0.0625
+v -0.0625 -0.3125 0.0625
+v -0.0625 -0.25 -0.0625
+v -0.0625 -0.3125 -0.0625
+v -0.125 -0.3125 0.125
+v -0.125 -0.3125 -0.125
+v 0.125 -0.3125 -0.125
+v 0.125 -0.3125 0.125
+v -0.125 -0.25 0.125
+v -0.125 -0.25 -0.125
+v 0.125 -0.25 -0.125
+v 0.125 -0.25 0.125
+
+# normals [8]
+
+vn -0.7071 0 0.7071
+vn -0.7071 0 -0.7071
+vn -1 0 0
+vn 0 0 -1
+vn 1 0 0
+vn 0 0 1
+vn 0 -1 0
+vn 0 1 0
+
+# uvs [54]
+
+vt 0 0
+vt 1 0
+vt 1 1
+vt 0 1
+vt 0.75 0
+vt 0.75 0.15625
+vt 0.5 0.15625
+vt 0.5 0
+vt 0.25 0.15625
+vt 0.25 0
+vt 0 0.15625
+vt 1 0.15625
+vt 0.25 0.40625
+vt 0 0.40625
+vt 0.75 0.40625
+vt 0.75 0.875
+vt 0.5 0.875
+vt 0.5 0.40625
+vt 0.25 0.875
+vt 0 0.875
+vt 1 0.40625
+vt 1 0.875
+vt 0.625 0.53125
+vt 0.625 0.46875
+vt 0.75 0.46875
+vt 0.75 0.53125
+vt 0.25 0.53125
+vt 0.25 0.46875
+vt 0.375 0.46875
+vt 0.375 0.53125
+vt 0.5 0.46875
+vt 0.5 0.53125
+vt 0.25 0.78125
+vt 0.25 0.75
+vt 0.5 0.75
+vt 0.5 0.78125
+vt 0.75 0.75
+vt 0.75 0.78125
+vt 1 0.75
+vt 1 0.78125
+vt 0 0.78125
+vt 0 0.75
+vt 0 0.5
+vt 0.25 0.5
+vt 0.25 0.25
+vt 0.25 0.21875
+vt 0.5 0.21875
+vt 0.5 0.25
+vt 0.75 0.21875
+vt 0.75 0.25
+vt 1 0.21875
+vt 1 0.25
+vt 0 0.25
+vt 0 0.21875
+
+# objects [3]
+
+g Wick
+
+s 1
+f 1/1/1 2/2/1 3/3/1 4/4/1
+f 5/1/2 6/2/2 7/3/2 8/4/2
+
+g Globe
+
+s 1
+f 9/5/3 10/6/3 11/7/3 12/8/3
+f 12/8/4 11/7/4 13/9/4 14/10/4
+f 14/10/5 13/9/5 15/11/5 16/1/5
+f 16/2/6 15/12/6 10/6/6 9/5/6
+f 12/13/7 14/14/7 16/11/7 9/9/7
+f 17/15/3 18/16/3 19/17/3 20/18/3
+f 20/18/4 19/17/4 21/19/4 22/13/4
+f 22/13/5 21/19/5 23/20/5 24/14/5
+f 24/21/6 23/22/6 18/16/6 17/15/6
+f 18/18/8 23/13/8 21/9/8 19/7/8
+
+g Metal
+
+s 1
+f 25/23/5 26/24/5 27/25/5 28/26/5
+f 28/27/6 27/28/6 29/29/6 30/30/6
+f 30/30/3 29/29/3 31/31/3 32/32/3
+f 26/24/4 25/23/4 32/32/4 31/31/4
+f 10/33/3 33/34/3 34/35/3 11/36/3
+f 11/36/4 34/35/4 35/37/4 13/38/4
+f 13/38/5 35/37/5 36/39/5 15/40/5
+f 15/41/6 36/42/6 33/34/6 10/33/6
+f 33/34/8 36/42/8 35/43/8 34/44/8
+f 37/45/3 17/46/3 20/47/3 38/48/3
+f 38/48/4 20/47/4 22/49/4 39/50/4
+f 39/50/5 22/49/5 24/51/5 40/52/5
+f 40/53/6 24/54/6 17/46/6 37/45/6
+f 38/44/7 39/43/7 40/53/7 37/45/7
+
diff --git a/morelights_vintage/models/morelights_vintage_streetlamp.obj b/morelights_vintage/models/morelights_vintage_streetlamp.obj
deleted file mode 100644
index 1dd847d..0000000
--- a/morelights_vintage/models/morelights_vintage_streetlamp.obj
+++ /dev/null
@@ -1,42 +0,0 @@
-# Blender v2.79 (sub 0) OBJ File: 'vintage_streetlamp.blend'
-# www.blender.org
-mtllib morelights_vintage_streetlamp.mtl
-o Plane
-v -0.312500 0.075000 0.312500
-v 0.312500 0.075000 0.312500
-v -0.312500 0.075000 -0.312500
-v 0.312500 0.075000 -0.312500
-v 0.000000 0.325000 0.000000
-vn 0.6247 -0.7809 0.0000
-vn 0.0000 -0.7809 -0.6247
-vn -0.6247 -0.7809 0.0000
-vn 0.0000 -0.7809 0.6247
-usemtl None
-s off
-f 1//1 3//1 5//1
-f 2//2 1//2 5//2
-f 4//3 2//3 5//3
-f 3//4 4//4 5//4
-o Cube.001
-v -0.187500 -0.500000 0.187500
-v -0.250000 0.125000 0.250000
-v -0.187500 -0.500000 -0.187500
-v -0.250000 0.125000 -0.250000
-v 0.187500 -0.500000 0.187500
-v 0.250000 0.125000 0.250000
-v 0.187500 -0.500000 -0.187500
-v 0.250000 0.125000 -0.250000
-vn -0.9950 -0.0995 0.0000
-vn 0.0000 -0.0995 -0.9950
-vn 0.9950 -0.0995 0.0000
-vn 0.0000 -0.0995 0.9950
-vn 0.0000 -1.0000 0.0000
-vn 0.0000 1.0000 0.0000
-usemtl None
-s off
-f 6//5 7//5 9//5 8//5
-f 8//6 9//6 13//6 12//6
-f 12//7 13//7 11//7 10//7
-f 10//8 11//8 7//8 6//8
-f 8//9 12//9 10//9 6//9
-f 13//10 9//10 7//10 11//10