diff --git a/.gitattribute b/.gitattribute
deleted file mode 100644
index 1060bf9f..00000000
--- a/.gitattribute
+++ /dev/null
@@ -1 +0,0 @@
-*.xml text
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..d5527be0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# convert all text files to CRLF on checkout, xmls won't be converted they are utf-16 encoded and thus need to be treated as binary
+* text=auto eol=crlf
\ No newline at end of file
diff --git a/Spriggit/Placed Light/Lights/Blue - 000802_Placed Light.esm.json b/Spriggit/Placed Light/Lights/Blue - 000802_Placed Light.esm.json
deleted file mode 100644
index b2b2de24..00000000
--- a/Spriggit/Placed Light/Lights/Blue - 000802_Placed Light.esm.json	
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "FormKey": "000802:Placed Light.esm",
-  "EditorID": "Blue",
-  "ObjectBounds": {
-    "First": "-38, -40, -74",
-    "Second": "38, 40, 48"
-  },
-  "Time": -1,
-  "Radius": 256,
-  "Color": "#000000FF",
-  "Flags": [
-    "Dynamic"
-  ],
-  "FalloffExponent": 1.0,
-  "FOV": 90.0,
-  "NearClip": 1.0,
-  "FlickerPeriod": 1.0,
-  "FadeValue": 1.0
-}
\ No newline at end of file
diff --git a/Spriggit/Placed Light/Lights/BluePotion - 000F4F_Placed Light.esm.json b/Spriggit/Placed Light/Lights/PL_BluePotion - 000F4F_Placed Light.esm.json
similarity index 91%
rename from Spriggit/Placed Light/Lights/BluePotion - 000F4F_Placed Light.esm.json
rename to Spriggit/Placed Light/Lights/PL_BluePotion - 000F4F_Placed Light.esm.json
index 047a2b6e..09642d32 100644
--- a/Spriggit/Placed Light/Lights/BluePotion - 000F4F_Placed Light.esm.json	
+++ b/Spriggit/Placed Light/Lights/PL_BluePotion - 000F4F_Placed Light.esm.json	
@@ -1,6 +1,6 @@
 {
   "FormKey": "000F4F:Placed Light.esm",
-  "EditorID": "BluePotion",
+  "EditorID": "PL_BluePotion",
   "ObjectBounds": {
     "First": "-38, -40, -74",
     "Second": "38, 40, 48"
diff --git a/Spriggit/Placed Light/Lights/Candle - 000800_Placed Light.esm.json b/Spriggit/Placed Light/Lights/PL_Candle - 000800_Placed Light.esm.json
similarity index 94%
rename from Spriggit/Placed Light/Lights/Candle - 000800_Placed Light.esm.json
rename to Spriggit/Placed Light/Lights/PL_Candle - 000800_Placed Light.esm.json
index f4cdb2c2..ccd76cf8 100644
--- a/Spriggit/Placed Light/Lights/Candle - 000800_Placed Light.esm.json	
+++ b/Spriggit/Placed Light/Lights/PL_Candle - 000800_Placed Light.esm.json	
@@ -1,6 +1,6 @@
 {
   "FormKey": "000800:Placed Light.esm",
-  "EditorID": "Candle",
+  "EditorID": "PL_Candle",
   "ObjectBounds": {
     "First": "-38, -40, -74",
     "Second": "38, 40, 48"
diff --git a/Spriggit/Placed Light/Lights/GreenPotion - 000F50_Placed Light.esm.json b/Spriggit/Placed Light/Lights/PL_GreenPotion - 000F50_Placed Light.esm.json
similarity index 90%
rename from Spriggit/Placed Light/Lights/GreenPotion - 000F50_Placed Light.esm.json
rename to Spriggit/Placed Light/Lights/PL_GreenPotion - 000F50_Placed Light.esm.json
index acc8f187..feef3793 100644
--- a/Spriggit/Placed Light/Lights/GreenPotion - 000F50_Placed Light.esm.json	
+++ b/Spriggit/Placed Light/Lights/PL_GreenPotion - 000F50_Placed Light.esm.json	
@@ -1,6 +1,6 @@
 {
   "FormKey": "000F50:Placed Light.esm",
-  "EditorID": "GreenPotion",
+  "EditorID": "PL_GreenPotion",
   "ObjectBounds": {
     "First": "-38, -40, -74",
     "Second": "38, 40, 48"
diff --git a/Spriggit/Placed Light/Lights/Orange - 000001_Placed Light.esm.json b/Spriggit/Placed Light/Lights/PL_Orange - 000001_Placed Light.esm.json
similarity index 92%
rename from Spriggit/Placed Light/Lights/Orange - 000001_Placed Light.esm.json
rename to Spriggit/Placed Light/Lights/PL_Orange - 000001_Placed Light.esm.json
index cdacbc10..3234327a 100644
--- a/Spriggit/Placed Light/Lights/Orange - 000001_Placed Light.esm.json	
+++ b/Spriggit/Placed Light/Lights/PL_Orange - 000001_Placed Light.esm.json	
@@ -1,6 +1,6 @@
 {
   "FormKey": "000001:Placed Light.esm",
-  "EditorID": "Orange",
+  "EditorID": "PL_Orange",
   "ObjectBounds": {
     "First": "-38, -40, -74",
     "Second": "38, 40, 48"
diff --git a/Spriggit/Placed Light/Lights/RedPotion - 000F51_Placed Light.esm.json b/Spriggit/Placed Light/Lights/PL_RedPotion - 000F51_Placed Light.esm.json
similarity index 91%
rename from Spriggit/Placed Light/Lights/RedPotion - 000F51_Placed Light.esm.json
rename to Spriggit/Placed Light/Lights/PL_RedPotion - 000F51_Placed Light.esm.json
index c4b27323..96e09159 100644
--- a/Spriggit/Placed Light/Lights/RedPotion - 000F51_Placed Light.esm.json	
+++ b/Spriggit/Placed Light/Lights/PL_RedPotion - 000F51_Placed Light.esm.json	
@@ -1,6 +1,6 @@
 {
   "FormKey": "000F51:Placed Light.esm",
-  "EditorID": "RedPotion",
+  "EditorID": "PL_RedPotion",
   "ObjectBounds": {
     "First": "-38, -40, -74",
     "Second": "38, 40, 48"
diff --git a/Spriggit/Placed Light/Lights/Green - 000803_Placed Light.esm.json b/Spriggit/Placed Light/Lights/PL_White - 000000_Placed Light.esm.json
similarity index 73%
rename from Spriggit/Placed Light/Lights/Green - 000803_Placed Light.esm.json
rename to Spriggit/Placed Light/Lights/PL_White - 000000_Placed Light.esm.json
index dc5418fa..2035e301 100644
--- a/Spriggit/Placed Light/Lights/Green - 000803_Placed Light.esm.json	
+++ b/Spriggit/Placed Light/Lights/PL_White - 000000_Placed Light.esm.json	
@@ -1,13 +1,13 @@
 {
-  "FormKey": "000803:Placed Light.esm",
-  "EditorID": "Green",
+  "FormKey": "000000:Placed Light.esm",
+  "EditorID": "PL_White",
   "ObjectBounds": {
     "First": "-38, -40, -74",
     "Second": "38, 40, 48"
   },
   "Time": -1,
   "Radius": 256,
-  "Color": "#0000FF00",
+  "Color": "#00FFFFFF",
   "Flags": [
     "Dynamic"
   ],
diff --git a/Spriggit/Placed Light/Lights/Yellow - 000002_Placed Light.esm.json b/Spriggit/Placed Light/Lights/PL_Yellow - 000002_Placed Light.esm.json
similarity index 92%
rename from Spriggit/Placed Light/Lights/Yellow - 000002_Placed Light.esm.json
rename to Spriggit/Placed Light/Lights/PL_Yellow - 000002_Placed Light.esm.json
index 265991ef..24b06e25 100644
--- a/Spriggit/Placed Light/Lights/Yellow - 000002_Placed Light.esm.json	
+++ b/Spriggit/Placed Light/Lights/PL_Yellow - 000002_Placed Light.esm.json	
@@ -1,6 +1,6 @@
 {
   "FormKey": "000002:Placed Light.esm",
-  "EditorID": "Yellow",
+  "EditorID": "PL_Yellow",
   "ObjectBounds": {
     "First": "-38, -40, -74",
     "Second": "38, 40, 48"
diff --git a/Spriggit/Placed Light/Lights/Pink - 000805_Placed Light.esm.json b/Spriggit/Placed Light/Lights/Pink - 000805_Placed Light.esm.json
deleted file mode 100644
index 858ed856..00000000
--- a/Spriggit/Placed Light/Lights/Pink - 000805_Placed Light.esm.json	
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "FormKey": "000805:Placed Light.esm",
-  "EditorID": "Pink",
-  "ObjectBounds": {
-    "First": "-38, -40, -74",
-    "Second": "38, 40, 48"
-  },
-  "Time": -1,
-  "Radius": 256,
-  "Color": "#00FF64E1",
-  "Flags": [
-    "Dynamic"
-  ],
-  "FalloffExponent": 1.0,
-  "FOV": 90.0,
-  "NearClip": 1.0,
-  "FlickerPeriod": 1.0,
-  "FadeValue": 1.0
-}
\ No newline at end of file
diff --git a/Spriggit/Placed Light/Lights/Purple - 000804_Placed Light.esm.json b/Spriggit/Placed Light/Lights/Purple - 000804_Placed Light.esm.json
deleted file mode 100644
index 3078d532..00000000
--- a/Spriggit/Placed Light/Lights/Purple - 000804_Placed Light.esm.json	
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "FormKey": "000804:Placed Light.esm",
-  "EditorID": "Purple",
-  "ObjectBounds": {
-    "First": "-38, -40, -74",
-    "Second": "38, 40, 48"
-  },
-  "Time": -1,
-  "Radius": 256,
-  "Color": "#006F00FF",
-  "Flags": [
-    "Dynamic"
-  ],
-  "FalloffExponent": 1.0,
-  "FOV": 90.0,
-  "NearClip": 1.0,
-  "FlickerPeriod": 1.0,
-  "FadeValue": 1.0
-}
\ No newline at end of file
diff --git a/Spriggit/Placed Light/Lights/Red - 000801_Placed Light.esm.json b/Spriggit/Placed Light/Lights/Red - 000801_Placed Light.esm.json
deleted file mode 100644
index 831b54dc..00000000
--- a/Spriggit/Placed Light/Lights/Red - 000801_Placed Light.esm.json	
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "FormKey": "000801:Placed Light.esm",
-  "EditorID": "Red",
-  "ObjectBounds": {
-    "First": "-38, -40, -74",
-    "Second": "38, 40, 48"
-  },
-  "Time": -1,
-  "Radius": 256,
-  "Color": "#00FF0000",
-  "Flags": [
-    "Dynamic"
-  ],
-  "FalloffExponent": 1.0,
-  "FOV": 90.0,
-  "NearClip": 1.0,
-  "FlickerPeriod": 1.0,
-  "FadeValue": 1.0
-}
\ No newline at end of file
diff --git a/package/LightPlacer/Placed Light/Placed Light - Apocrypha.json b/package/LightPlacer/Placed Light/Placed Light - Apocrypha.json
index 71c22c27..a00bbef4 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Apocrypha.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Apocrypha.json	
@@ -16,7 +16,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_BluePotion",
           "radius": 256.0,
           "fade": 1.0
         }
@@ -34,7 +34,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_BluePotion",
           "radius": 256.0,
           "fade": 1.0
         }
@@ -49,7 +49,7 @@
       {
         "nodes": ["Seed01:18"],
         "data": {
-          "light": "GreenPotion",
+          "light": "PL_GreenPotion",
           "radius": 256.0,
           "fade": 1.0
         }
@@ -62,7 +62,7 @@
       {
         "nodes": ["ILight01:17"],
         "data": {
-          "light": "Yellow",
+          "light": "PL_Yellow",
           "radius": 512.0,
           "fade": 1.0
         }
@@ -78,7 +78,7 @@
       {
         "nodes": ["Post01:18"],
         "data": {
-          "light": "Yellow",
+          "light": "PL_Yellow",
           "radius": 256.0,
           "fade": 1.0
         }
@@ -128,7 +128,7 @@
           "Collision11:0"
         ],
         "data": {
-          "light": "GreenPotion",
+          "light": "PL_GreenPotion",
           "radius": 128.0,
           "fade": 1.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Candles - Timer.json b/package/LightPlacer/Placed Light/Placed Light - Candles - Timer.json
index 72b73a31..a53be929 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Candles - Timer.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Candles - Timer.json	
@@ -29,7 +29,7 @@
           "clutter\\shrines\\shrinebase.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 64.0,
           "fade": 1.0,
           "conditions": ["Self IsInInterior NONE NONE == 1 AND"]
@@ -48,7 +48,7 @@
           "clutter\\candles\\candlehornfloor01.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 1.0,
           "conditions": ["Self IsInInterior NONE NONE == 1 AND"]
@@ -153,7 +153,7 @@
           "clutter\\silver\\SilverCandleStick03_J.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 64.0,
           "fade": 0.8,
           "conditions": ["Self IsInInterior NONE NONE == 1 AND"]
@@ -190,7 +190,7 @@
           "clutter\\sovngarde\\sovcandlestick03static.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 64.0,
           "fade": 0.6,
           "flags": "RandomAnimStart",
@@ -247,7 +247,7 @@
           "clutter\\candles\\candlehornfloor01.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 0.8,
           "flags": "RandomAnimStart",
@@ -390,7 +390,7 @@
           "clutter\\silver\\SilverCandleStick03_J.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 64.0,
           "fade": 0.8,
           "flags": "RandomAnimStart",
diff --git a/package/LightPlacer/Placed Light/Placed Light - Candles.json b/package/LightPlacer/Placed Light/Placed Light - Candles.json
index 3d776612..fb94452a 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Candles.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Candles.json	
@@ -29,7 +29,7 @@
           "clutter\\shrines\\shrinebase.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 64.0,
           "fade": 1.0
         }
@@ -47,7 +47,7 @@
           "clutter\\candles\\candlehornfloor01.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 1.0
         }
@@ -151,7 +151,7 @@
           "clutter\\silver\\SilverCandleStick03_J.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 64.0,
           "fade": 1.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Chandeliers.json b/package/LightPlacer/Placed Light/Placed Light - Chandeliers.json
index 6b650ca9..a49140e2 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Chandeliers.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Chandeliers.json	
@@ -11,7 +11,7 @@
           "clutter\\candles\\candlehornchandelier02.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 384.0,
           "fade": 1.0,
           "flags": "PortalStrict",
@@ -32,7 +32,7 @@
           "clutter\\candles\\candlehornchandelier02.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 1.0,
           "flags": "PortalStrict",
@@ -56,7 +56,7 @@
           "clutter\\candles\\candlehornchandelier02.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 288.0,
           "fade": 1.0,
           "flags": "PortalStrict",
@@ -80,7 +80,7 @@
           "clutter\\candles\\candlehornchandelier02.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 288.0,
           "fade": 1.0,
           "flags": "PortalStrict",
@@ -104,7 +104,7 @@
           "clutter\\candles\\candlehornchandelier02.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 1.0,
           "flags": "PortalStrict",
@@ -125,7 +125,7 @@
           "clutter\\candles\\candlehornchandelier02.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 304.0,
           "fade": 1.0,
           "flags": "PortalStrict",
diff --git a/package/LightPlacer/Placed Light/Placed Light - Clutter.json b/package/LightPlacer/Placed Light/Placed Light - Clutter.json
index 82a67a94..badb19e6 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Clutter.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Clutter.json	
@@ -9,7 +9,7 @@
       {
         "nodes": ["Burner01"],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 32.0,
           "fade": 1.0,
           "flags": "IgnoreScale"
@@ -31,7 +31,7 @@
       {
         "nodes": ["Burner01"],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 32.0,
           "fade": 1.0,
           "flags": "IgnoreScale"
@@ -92,7 +92,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Bluepotion",
+          "light": "PL_BluePotion",
           "radius": 32.0,
           "fade": 0.7,
           "flags": "Simple|IgnoreScale"
@@ -109,7 +109,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Orange",
+          "light": "PL_Orange",
           "radius": 32.0,
           "fade": 0.7,
           "flags": "Simple|IgnoreScale"
@@ -126,7 +126,7 @@
       {
         "points": [[0.0, 0.0, 4.5]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.5,
           "fade": 15.0,
           "flags": "Simple|IgnoreScale"
@@ -144,7 +144,7 @@
       {
         "points": [[0.0, 0.0, 4.5]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.5,
           "fade": 15.0,
           "flags": "Simple|IgnoreScale"
@@ -164,7 +164,7 @@
       {
         "points": [[0.0, 0.0, 4.5]],
         "data": {
-          "light": "Bluepotion",
+          "light": "PL_BluePotion",
           "radius": 5.5,
           "fade": 15.0,
           "flags": "Simple|IgnoreScale"
@@ -181,7 +181,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 6.0,
           "fade": 3.5,
           "flags": "IgnoreScale|RandomAnimStart",
@@ -228,7 +228,7 @@
       {
         "points": [[0.0, 0.0, 5.0]],
         "data": {
-          "light": "Orange",
+          "light": "PL_Orange",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -256,7 +256,7 @@
       {
         "points": [[0.0, 0.0, 5.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_BluePotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -339,7 +339,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -353,7 +353,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -367,7 +367,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -381,7 +381,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 10.0,
           "flags": "IgnoreScale"
@@ -395,7 +395,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -409,7 +409,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -423,7 +423,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -437,7 +437,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 10.0,
           "flags": "IgnoreScale"
@@ -451,7 +451,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 40.0,
           "flags": "IgnoreScale"
@@ -465,7 +465,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 30.0,
           "flags": "IgnoreScale"
@@ -479,7 +479,7 @@
       {
         "points": [[0.0, 0.0, 8.5]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.25,
           "fade": 20.0,
           "flags": "IgnoreScale"
@@ -493,7 +493,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_RedPotion",
           "radius": 5.15,
           "fade": 10.0,
           "flags": "IgnoreScale"
@@ -537,7 +537,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -551,7 +551,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -565,7 +565,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -579,7 +579,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -593,7 +593,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -607,7 +607,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -621,7 +621,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -635,7 +635,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -649,7 +649,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -663,7 +663,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -677,7 +677,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -691,7 +691,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -705,7 +705,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 10.0,
           "flags": "IgnoreScale"
@@ -719,7 +719,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -733,7 +733,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -747,7 +747,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 35.0,
           "flags": "IgnoreScale"
@@ -761,7 +761,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 5.25,
           "fade": 10.0,
           "flags": "IgnoreScale"
@@ -887,7 +887,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 4.75,
           "fade": 10.0,
           "flags": "IgnoreScale"
@@ -915,7 +915,7 @@
       {
         "points": [[0.0, 0.0, 4.0]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_Redpotion",
           "radius": 4.75,
           "fade": 35.0,
           "flags": "IgnoreScale|RandomAnimStart",
@@ -1031,7 +1031,7 @@
       {
         "points": [[0.0, 0.0, 2.0]],
         "data": {
-          "light": "Greenpotion",
+          "light": "PL_GreenPotion",
           "radius": 6.25,
           "fade": 1.5,
           "flags": "IgnoreScale"
diff --git a/package/LightPlacer/Placed Light/Placed Light - Dark Elf Lanterns.json b/package/LightPlacer/Placed Light/Placed Light - Dark Elf Lanterns.json
index 54eb3327..893fc56d 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Dark Elf Lanterns.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Dark Elf Lanterns.json	
@@ -9,7 +9,7 @@
           [5.0, 190.0, -235.0]
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -25,7 +25,7 @@
           [0.0, -140.0, -135.0]
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -38,7 +38,7 @@
       {
         "points": [[0.0, 0.0, -160.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -51,7 +51,7 @@
       {
         "points": [[0.0, 0.0, -125.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -64,7 +64,7 @@
       {
         "points": [[0.0, 0.0, -85.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -77,7 +77,7 @@
       {
         "nodes": ["Object09"],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -94,7 +94,7 @@
           [5.0, 190.0, -235.0]
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -110,7 +110,7 @@
           [0.0, -140.0, -135.0]
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -123,7 +123,7 @@
       {
         "points": [[0.0, 0.0, -160.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -136,7 +136,7 @@
       {
         "points": [[0.0, 0.0, -125.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -149,7 +149,7 @@
       {
         "points": [[0.0, 0.0, -85.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -162,7 +162,7 @@
       {
         "points": [[0.0, 0.0, -40.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 128.0,
           "fade": 1.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Enchants.json b/package/LightPlacer/Placed Light/Placed Light - Enchants.json
index b5ec8a06..7769fb34 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Enchants.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Enchants.json	
@@ -8,7 +8,7 @@
           "furniture\\enchantingworkstation.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 64.0,
           "fade": 1.0
         }
@@ -24,7 +24,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_BluePotion",
           "radius": 128.0,
           "fade": 1.0
         }
@@ -37,7 +37,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Orange",
+          "light": "PL_Orange",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -55,7 +55,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_BluePotion",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -85,7 +85,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "GreenPotion",
+          "light": "PL_GreenPotion",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -98,7 +98,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "RedPotion",
+          "light": "PL_Redpotion",
           "fade": 1.0,
           "radius": 82.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - FEC.json b/package/LightPlacer/Placed Light/Placed Light - FEC.json
index 90019442..31b021d4 100644
--- a/package/LightPlacer/Placed Light/Placed Light - FEC.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - FEC.json	
@@ -17,7 +17,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Orange",
+          "light": "PL_Orange",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -30,7 +30,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_BluePotion",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -64,7 +64,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "RedPotion",
+          "light": "PL_Redpotion",
           "fade": 1.0,
           "radius": 82.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Falmer.json b/package/LightPlacer/Placed Light/Placed Light - Falmer.json
index fe360f4f..9f04bc68 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Falmer.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Falmer.json	
@@ -18,7 +18,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_BluePotion",
           "radius": 256.0,
           "fade": 1.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Fires - Timer.json b/package/LightPlacer/Placed Light/Placed Light - Fires - Timer.json
index 17f958cb..91391434 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Fires - Timer.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Fires - Timer.json	
@@ -296,7 +296,7 @@
           "furniture\\blacksmithingskyforgemarker.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 500.0,
           "fade": 1.0,
           "flags": "IgnoreScale"
diff --git a/package/LightPlacer/Placed Light/Placed Light - Fires.json b/package/LightPlacer/Placed Light/Placed Light - Fires.json
index c8716d37..244d62b8 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Fires.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Fires.json	
@@ -104,7 +104,7 @@
           "furniture\\blacksmithingskyforgemarker.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 500.0,
           "fade": 1.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Furniture.json b/package/LightPlacer/Placed Light/Placed Light - Furniture.json
index e443d1f8..55297765 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Furniture.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Furniture.json	
@@ -8,7 +8,7 @@
       {
         "points": [[0.0, 0.0, 4.5]],
         "data": {
-          "light": "Redpotion",
+          "light": "PL_Redpotion",
           "radius": 7.0,
           "fade": 5.0,
           "flags": "Simple|IgnoreScale"
diff --git a/package/LightPlacer/Placed Light/Placed Light - Lanterns - Timer.json b/package/LightPlacer/Placed Light/Placed Light - Lanterns - Timer.json
index 2aa9971a..abd88d5c 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Lanterns - Timer.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Lanterns - Timer.json	
@@ -10,7 +10,7 @@
           "medieval lanterns\\medieval_lantern_falkreath.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 1.0,
           "flags": "RandomAnimStart",
@@ -63,7 +63,7 @@
           "medieval lanterns\\medieval_lantern_falkreath.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 320.0,
           "fade": 1.0,
           "flags": "RandomAnimStart",
@@ -137,7 +137,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 320.0,
           "fade": 1.0,
           "flags": "RandomAnimStart",
@@ -232,7 +232,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 1.0,
           "flags": "RandomAnimStart",
diff --git a/package/LightPlacer/Placed Light/Placed Light - Lanterns.json b/package/LightPlacer/Placed Light/Placed Light - Lanterns.json
index 8e7b4b71..ac2aef90 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Lanterns.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Lanterns.json	
@@ -10,7 +10,7 @@
           "medieval lanterns\\medieval_lantern_falkreath.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 1.0
         }
@@ -45,7 +45,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 320.0,
           "fade": 1.0
         }
@@ -101,7 +101,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 256.0,
           "fade": 1.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Magic FX.json b/package/LightPlacer/Placed Light/Placed Light - Magic FX.json
index 398ff1d6..c69d9e5b 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Magic FX.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Magic FX.json	
@@ -32,7 +32,7 @@
       {
         "points": [[0.0, 0.0, 5.0]],
         "data": {
-          "light": "Orange",
+          "light": "PL_Orange",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -81,7 +81,7 @@
       {
         "points": [[0.0, 0.0, 5.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_BluePotion",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -203,7 +203,7 @@
       {
         "points": [[0.0, 0.0, 5.0]],
         "data": {
-          "light": "Yellow",
+          "light": "PL_Yellow",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -228,7 +228,7 @@
       {
         "points": [[0.0, 0.0, 5.0]],
         "data": {
-          "light": "GreenPotion",
+          "light": "PL_GreenPotion",
           "fade": 1.0,
           "radius": 82.0
         }
@@ -250,7 +250,7 @@
       {
         "points": [[0.0, 0.0, 5.0]],
         "data": {
-          "light": "RedPotion",
+          "light": "PL_RedPotion",
           "fade": 1.0,
           "radius": 82.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Mote.json b/package/LightPlacer/Placed Light/Placed Light - Mote.json
index e30bb671..d974449c 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Mote.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Mote.json	
@@ -5,7 +5,7 @@
       {
         "points": [[0.0, 0.0, 0.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_White",
           "color": [127, 215, 255],
           "radius": 64.0,
           "fade": 0.8
diff --git a/package/LightPlacer/Placed Light/Placed Light - Nordic Halls.json b/package/LightPlacer/Placed Light/Placed Light - Nordic Halls.json
index 5c159e12..27cafcc4 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Nordic Halls.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Nordic Halls.json	
@@ -21,7 +21,7 @@
           "dungeons\\nordic\\temple\\bghalls\\nortmphallbgcolumnsm02.nif"
         ],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 64.0,
           "fade": 1.0
         }
diff --git a/package/LightPlacer/Placed Light/Placed Light - Vanilla Fires - Timer.json b/package/LightPlacer/Placed Light/Placed Light - Vanilla Fires - Timer.json
index fed93f1e..a21b9448 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Vanilla Fires - Timer.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Vanilla Fires - Timer.json	
@@ -117,7 +117,7 @@
       {
         "nodes": ["Glow"],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 500.0,
           "fade": 1.0,
           "flags": "IgnoreScale"
diff --git a/package/LightPlacer/Placed Light/Placed Light - Vanilla Fires.json b/package/LightPlacer/Placed Light/Placed Light - Vanilla Fires.json
index 09d1e7e0..8b7c9758 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Vanilla Fires.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Vanilla Fires.json	
@@ -72,7 +72,7 @@
       {
         "nodes": ["Glow"],
         "data": {
-          "light": "Candle",
+          "light": "PL_Candle",
           "radius": 500.0,
           "fade": 1.0,
           "flags": "IgnoreScale"
diff --git a/package/LightPlacer/Placed Light/Placed Light - Witchlight.json b/package/LightPlacer/Placed Light/Placed Light - Witchlight.json
index 8299aae1..2480be97 100644
--- a/package/LightPlacer/Placed Light/Placed Light - Witchlight.json	
+++ b/package/LightPlacer/Placed Light/Placed Light - Witchlight.json	
@@ -5,7 +5,7 @@
       {
         "points": [[0.0, -90.0, 80.0]],
         "data": {
-          "light": "BluePotion",
+          "light": "PL_White",
           "color": [202, 227, 225],
           "radius": 128.0,
           "fade": 2.0