diff --git a/Chroma/LightIDTables/BigMirrorEnvironment.json b/Chroma/LightIDTables/BigMirrorEnvironment.json
index 020ad1af..c6ac6e07 100644
--- a/Chroma/LightIDTables/BigMirrorEnvironment.json
+++ b/Chroma/LightIDTables/BigMirrorEnvironment.json
@@ -12,66 +12,66 @@
     "10": 4
   },
   "2": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23,
-    "21": 24,
-    "22": 25,
-    "23": 26,
-    "24": 27,
-    "25": 28,
-    "26": 29,
-    "27": 30,
-    "28": 31,
-    "29": 32,
-    "30": 33,
-    "31": 34,
-    "32": 35,
-    "33": 36,
-    "34": 37,
-    "35": 38,
-    "36": 39,
-    "37": 40,
-    "38": 41,
-    "39": 42,
-    "40": 43,
-    "41": 44,
-    "42": 45,
-    "43": 46,
-    "44": 47,
-    "45": 48,
-    "46": 49,
-    "47": 50,
-    "48": 51,
-    "49": 52,
-    "50": 53,
-    "51": 54,
-    "52": 55,
-    "53": 56,
-    "54": 57,
-    "55": 58,
-    "56": 59,
-    "57": 60,
-    "58": 61,
-    "59": 62,
-    "60": 63
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25,
+    "21": 26,
+    "22": 27,
+    "23": 28,
+    "24": 29,
+    "25": 30,
+    "26": 31,
+    "27": 32,
+    "28": 33,
+    "29": 34,
+    "30": 35,
+    "31": 36,
+    "32": 37,
+    "33": 38,
+    "34": 39,
+    "35": 40,
+    "36": 41,
+    "37": 42,
+    "38": 43,
+    "39": 44,
+    "40": 45,
+    "41": 46,
+    "42": 47,
+    "43": 48,
+    "44": 49,
+    "45": 50,
+    "46": 51,
+    "47": 52,
+    "48": 53,
+    "49": 54,
+    "50": 55,
+    "51": 56,
+    "52": 57,
+    "53": 58,
+    "54": 59,
+    "55": 60,
+    "56": 61,
+    "57": 62,
+    "58": 63,
+    "59": 64,
+    "60": 65
   },
   "3": {
     "1": 7,
diff --git a/Chroma/LightIDTables/DragonsEnvironment.json b/Chroma/LightIDTables/DragonsEnvironment.json
index d3e8878b..0adeb769 100644
--- a/Chroma/LightIDTables/DragonsEnvironment.json
+++ b/Chroma/LightIDTables/DragonsEnvironment.json
@@ -4,68 +4,68 @@
     "2": 7
   },
   "2": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23,
-    "21": 24,
-    "22": 25,
-    "23": 26,
-    "24": 27,
-    "25": 28,
-    "26": 29,
-    "27": 30,
-    "28": 31,
-    "29": 32,
-    "30": 33,
-    "31": 34,
-    "32": 35,
-    "33": 36,
-    "34": 37,
-    "35": 38,
-    "36": 39,
-    "37": 40,
-    "38": 41,
-    "39": 42,
-    "40": 43,
-    "41": 44,
-    "42": 45,
-    "43": 46,
-    "44": 47,
-    "45": 48,
-    "46": 49,
-    "47": 50,
-    "48": 51,
-    "49": 52,
-    "50": 53,
-    "51": 54,
-    "52": 55,
-    "53": 56,
-    "54": 57,
-    "55": 58,
-    "56": 59,
-    "57": 60,
-    "58": 61,
-    "59": 62,
-    "60": 63,
-    "61": 67,
-    "62": 64
+    "1": 8,
+    "2": 9,
+    "3": 10,
+    "4": 11,
+    "5": 12,
+    "6": 13,
+    "7": 14,
+    "8": 15,
+    "9": 16,
+    "10": 17,
+    "11": 18,
+    "12": 19,
+    "13": 20,
+    "14": 21,
+    "15": 22,
+    "16": 23,
+    "17": 24,
+    "18": 25,
+    "19": 26,
+    "20": 27,
+    "21": 28,
+    "22": 29,
+    "23": 30,
+    "24": 31,
+    "25": 32,
+    "26": 33,
+    "27": 34,
+    "28": 35,
+    "29": 36,
+    "30": 37,
+    "31": 38,
+    "32": 39,
+    "33": 40,
+    "34": 41,
+    "35": 42,
+    "36": 43,
+    "37": 44,
+    "38": 45,
+    "39": 46,
+    "40": 47,
+    "41": 48,
+    "42": 49,
+    "43": 50,
+    "44": 51,
+    "45": 52,
+    "46": 53,
+    "47": 54,
+    "48": 55,
+    "49": 56,
+    "50": 57,
+    "51": 58,
+    "52": 59,
+    "53": 60,
+    "54": 61,
+    "55": 62,
+    "56": 63,
+    "57": 64,
+    "58": 65,
+    "59": 66,
+    "60": 67,
+    "61": 7,
+    "62": 4
   },
   "3": {
     "1": 5,
diff --git a/Chroma/LightIDTables/FitBeatEnvironment.json b/Chroma/LightIDTables/FitBeatEnvironment.json
index 42a1c0a8..4bcee429 100644
--- a/Chroma/LightIDTables/FitBeatEnvironment.json
+++ b/Chroma/LightIDTables/FitBeatEnvironment.json
@@ -1,67 +1,67 @@
 {
   "1": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23,
-    "21": 24,
-    "22": 25,
-    "23": 26,
-    "24": 27,
-    "25": 28,
-    "26": 29,
-    "27": 30,
-    "28": 31,
-    "29": 32,
-    "30": 33
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25,
+    "21": 26,
+    "22": 27,
+    "23": 28,
+    "24": 29,
+    "25": 30,
+    "26": 31,
+    "27": 32,
+    "28": 33,
+    "29": 34,
+    "30": 35
   },
   "2": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23,
-    "21": 24,
-    "22": 25,
-    "23": 26,
-    "24": 27,
-    "25": 28,
-    "26": 29,
-    "27": 30,
-    "28": 31,
-    "29": 32,
-    "30": 33
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25,
+    "21": 26,
+    "22": 27,
+    "23": 28,
+    "24": 29,
+    "25": 30,
+    "26": 31,
+    "27": 32,
+    "28": 33,
+    "29": 34,
+    "30": 35
   },
   "3": {
     "1": 6,
diff --git a/Chroma/LightIDTables/GreenDayEnvironment.json b/Chroma/LightIDTables/GreenDayEnvironment.json
index a877cd71..60bf7818 100644
--- a/Chroma/LightIDTables/GreenDayEnvironment.json
+++ b/Chroma/LightIDTables/GreenDayEnvironment.json
@@ -18,66 +18,66 @@
     "16": 4
   },
   "2": {
-    "1": 3,
-    "2": 4,
-    "3": 5,
-    "4": 6,
-    "5": 7,
-    "6": 8,
-    "7": 9,
-    "8": 10,
-    "9": 11,
-    "10": 12,
-    "11": 13,
-    "12": 14,
-    "13": 15,
-    "14": 16,
-    "15": 17,
-    "16": 18,
-    "17": 19,
-    "18": 20,
-    "19": 21,
-    "20": 22,
-    "21": 23,
-    "22": 24,
-    "23": 25,
-    "24": 26,
-    "25": 27,
-    "26": 28,
-    "27": 29,
-    "28": 30,
-    "29": 31,
-    "30": 32,
-    "31": 33,
-    "32": 34,
-    "33": 35,
-    "34": 36,
-    "35": 37,
-    "36": 38,
-    "37": 39,
-    "38": 40,
-    "39": 41,
-    "40": 42,
-    "41": 43,
-    "42": 44,
-    "43": 45,
-    "44": 46,
-    "45": 47,
-    "46": 48,
-    "47": 49,
-    "48": 50,
-    "49": 51,
-    "50": 52,
-    "51": 53,
-    "52": 54,
-    "53": 55,
-    "54": 56,
-    "55": 57,
-    "56": 58,
-    "57": 59,
-    "58": 60,
-    "59": 61,
-    "60": 62
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25,
+    "21": 26,
+    "22": 27,
+    "23": 28,
+    "24": 29,
+    "25": 30,
+    "26": 31,
+    "27": 32,
+    "28": 33,
+    "29": 34,
+    "30": 35,
+    "31": 36,
+    "32": 37,
+    "33": 38,
+    "34": 39,
+    "35": 40,
+    "36": 41,
+    "37": 42,
+    "38": 43,
+    "39": 44,
+    "40": 45,
+    "41": 46,
+    "42": 47,
+    "43": 48,
+    "44": 49,
+    "45": 50,
+    "46": 51,
+    "47": 52,
+    "48": 53,
+    "49": 54,
+    "50": 55,
+    "51": 56,
+    "52": 57,
+    "53": 58,
+    "54": 59,
+    "55": 60,
+    "56": 61,
+    "57": 62,
+    "58": 63,
+    "59": 64,
+    "60": 65
   },
   "3": {
     "1": 7,
diff --git a/Chroma/LightIDTables/GreenDayGrenadeEnvironment.json b/Chroma/LightIDTables/GreenDayGrenadeEnvironment.json
index cd403d86..0e0ab731 100644
--- a/Chroma/LightIDTables/GreenDayGrenadeEnvironment.json
+++ b/Chroma/LightIDTables/GreenDayGrenadeEnvironment.json
@@ -17,6 +17,68 @@
     "15": 7,
     "16": 14
   },
+  "2": {
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25,
+    "21": 26,
+    "22": 27,
+    "23": 28,
+    "24": 29,
+    "25": 30,
+    "26": 31,
+    "27": 32,
+    "28": 33,
+    "29": 34,
+    "30": 35,
+    "31": 36,
+    "32": 37,
+    "33": 38,
+    "34": 39,
+    "35": 40,
+    "36": 41,
+    "37": 42,
+    "38": 43,
+    "39": 44,
+    "40": 45,
+    "41": 46,
+    "42": 47,
+    "43": 48,
+    "44": 49,
+    "45": 50,
+    "46": 51,
+    "47": 52,
+    "48": 53,
+    "49": 54,
+    "50": 55,
+    "51": 56,
+    "52": 57,
+    "53": 58,
+    "54": 59,
+    "55": 60,
+    "56": 61,
+    "57": 62,
+    "58": 63,
+    "59": 64,
+    "60": 65
+  },
   "3": {
     "1": 5,
     "2": 3,
diff --git a/Chroma/LightIDTables/MonstercatEnvironment.json b/Chroma/LightIDTables/MonstercatEnvironment.json
index a044ca86..8251209e 100644
--- a/Chroma/LightIDTables/MonstercatEnvironment.json
+++ b/Chroma/LightIDTables/MonstercatEnvironment.json
@@ -41,11 +41,12 @@
     "6": 12,
     "7": 8,
     "8": 0,
-    "9": 19,
-    "10": 17,
-    "11": 18,
-    "12": 20,
+    "9": 20,
+    "10": 18,
+    "11": 19,
+    "12": 21,
     "13": 6,
-    "14": 4
+    "14": 4,
+    "15": 17
   }
 }
diff --git a/Chroma/LightIDTables/NiceEnvironment.json b/Chroma/LightIDTables/NiceEnvironment.json
index 66bd48a9..376c9247 100644
--- a/Chroma/LightIDTables/NiceEnvironment.json
+++ b/Chroma/LightIDTables/NiceEnvironment.json
@@ -10,46 +10,46 @@
     "8": 9
   },
   "2": {
-    "1": 3,
-    "2": 4,
-    "3": 5,
-    "4": 6,
-    "5": 7,
-    "6": 8,
-    "7": 9,
-    "8": 10,
-    "9": 11,
-    "10": 12,
-    "11": 13,
-    "12": 14,
-    "13": 15,
-    "14": 16,
-    "15": 17,
-    "16": 18,
-    "17": 19,
-    "18": 20,
-    "19": 21,
-    "20": 22,
-    "21": 23,
-    "22": 24,
-    "23": 25,
-    "24": 26,
-    "25": 27,
-    "26": 28,
-    "27": 29,
-    "28": 30,
-    "29": 31,
-    "30": 32,
-    "31": 33,
-    "32": 34,
-    "33": 35,
-    "34": 36,
-    "35": 37,
-    "36": 38,
-    "37": 39,
-    "38": 40,
-    "39": 41,
-    "40": 42
+    "1": 5,
+    "2": 6,
+    "3": 7,
+    "4": 8,
+    "5": 9,
+    "6": 10,
+    "7": 11,
+    "8": 12,
+    "9": 13,
+    "10": 14,
+    "11": 15,
+    "12": 16,
+    "13": 17,
+    "14": 18,
+    "15": 19,
+    "16": 20,
+    "17": 21,
+    "18": 22,
+    "19": 23,
+    "20": 24,
+    "21": 25,
+    "22": 26,
+    "23": 27,
+    "24": 28,
+    "25": 29,
+    "26": 30,
+    "27": 31,
+    "28": 32,
+    "29": 33,
+    "30": 34,
+    "31": 35,
+    "32": 36,
+    "33": 37,
+    "34": 38,
+    "35": 39,
+    "36": 40,
+    "37": 41,
+    "38": 42,
+    "39": 43,
+    "40": 44
   },
   "3": {
     "1": 1,
diff --git a/Chroma/LightIDTables/OriginsEnvironment.json b/Chroma/LightIDTables/OriginsEnvironment.json
index 04678bfe..7cf7e1c3 100644
--- a/Chroma/LightIDTables/OriginsEnvironment.json
+++ b/Chroma/LightIDTables/OriginsEnvironment.json
@@ -6,66 +6,66 @@
     "4": 4
   },
   "2": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23,
-    "21": 24,
-    "22": 25,
-    "23": 26,
-    "24": 27,
-    "25": 28,
-    "26": 29,
-    "27": 30,
-    "28": 31,
-    "29": 32,
-    "30": 33,
-    "31": 34,
-    "32": 35,
-    "33": 36,
-    "34": 37,
-    "35": 38,
-    "36": 39,
-    "37": 40,
-    "38": 41,
-    "39": 42,
-    "40": 43,
-    "41": 44,
-    "42": 45,
-    "43": 46,
-    "44": 47,
-    "45": 48,
-    "46": 49,
-    "47": 50,
-    "48": 51,
-    "49": 52,
-    "50": 53,
-    "51": 54,
-    "52": 55,
-    "53": 56,
-    "54": 57,
-    "55": 58,
-    "56": 59,
-    "57": 60,
-    "58": 61,
-    "59": 62,
-    "60": 63
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25,
+    "21": 26,
+    "22": 27,
+    "23": 28,
+    "24": 29,
+    "25": 30,
+    "26": 31,
+    "27": 32,
+    "28": 33,
+    "29": 34,
+    "30": 35,
+    "31": 36,
+    "32": 37,
+    "33": 38,
+    "34": 39,
+    "35": 40,
+    "36": 41,
+    "37": 42,
+    "38": 43,
+    "39": 44,
+    "40": 45,
+    "41": 46,
+    "42": 47,
+    "43": 48,
+    "44": 49,
+    "45": 50,
+    "46": 51,
+    "47": 52,
+    "48": 53,
+    "49": 54,
+    "50": 55,
+    "51": 56,
+    "52": 57,
+    "53": 58,
+    "54": 59,
+    "55": 60,
+    "56": 61,
+    "57": 62,
+    "58": 63,
+    "59": 64,
+    "60": 65
   },
   "3": {
     "1": 3,
diff --git a/Chroma/LightIDTables/PanicEnvironment.json b/Chroma/LightIDTables/PanicEnvironment.json
index cf700003..8daff04f 100644
--- a/Chroma/LightIDTables/PanicEnvironment.json
+++ b/Chroma/LightIDTables/PanicEnvironment.json
@@ -4,68 +4,68 @@
     "2": 7
   },
   "2": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23,
-    "21": 24,
-    "22": 25,
-    "23": 26,
-    "24": 27,
-    "25": 28,
-    "26": 29,
-    "27": 30,
-    "28": 31,
-    "29": 32,
-    "30": 33,
-    "31": 34,
-    "32": 35,
-    "33": 36,
-    "34": 37,
-    "35": 38,
-    "36": 39,
-    "37": 40,
-    "38": 41,
-    "39": 42,
-    "40": 43,
-    "41": 44,
-    "42": 45,
-    "43": 46,
-    "44": 47,
-    "45": 48,
-    "46": 49,
-    "47": 50,
-    "48": 51,
-    "49": 52,
-    "50": 53,
-    "51": 54,
-    "52": 55,
-    "53": 56,
-    "54": 57,
-    "55": 58,
-    "56": 59,
-    "57": 60,
-    "58": 61,
-    "59": 62,
-    "60": 63,
-    "61": 66,
-    "62": 67
+    "1": 8,
+    "2": 9,
+    "3": 10,
+    "4": 11,
+    "5": 12,
+    "6": 13,
+    "7": 14,
+    "8": 15,
+    "9": 16,
+    "10": 17,
+    "11": 18,
+    "12": 19,
+    "13": 20,
+    "14": 21,
+    "15": 22,
+    "16": 23,
+    "17": 24,
+    "18": 25,
+    "19": 26,
+    "20": 27,
+    "21": 28,
+    "22": 29,
+    "23": 30,
+    "24": 31,
+    "25": 32,
+    "26": 33,
+    "27": 34,
+    "28": 35,
+    "29": 36,
+    "30": 37,
+    "31": 38,
+    "32": 39,
+    "33": 40,
+    "34": 41,
+    "35": 42,
+    "36": 43,
+    "37": 44,
+    "38": 45,
+    "39": 46,
+    "40": 47,
+    "41": 48,
+    "42": 49,
+    "43": 50,
+    "44": 51,
+    "45": 52,
+    "46": 53,
+    "47": 54,
+    "48": 55,
+    "49": 56,
+    "50": 57,
+    "51": 58,
+    "52": 59,
+    "53": 60,
+    "54": 61,
+    "55": 62,
+    "56": 63,
+    "57": 64,
+    "58": 65,
+    "59": 66,
+    "60": 67,
+    "61": 6,
+    "62": 7
   },
   "3": {
     "1": 2,
diff --git a/Chroma/LightIDTables/TimbalandEnvironment.json b/Chroma/LightIDTables/TimbalandEnvironment.json
index 36bd1e9c..7aef8d2f 100644
--- a/Chroma/LightIDTables/TimbalandEnvironment.json
+++ b/Chroma/LightIDTables/TimbalandEnvironment.json
@@ -1,59 +1,59 @@
 {
   "1": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25
   },
   "2": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25
   },
   "3": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15
   },
   "4": {
     "1": 4,
diff --git a/Chroma/LightIDTables/TriangleEnvironment.json b/Chroma/LightIDTables/TriangleEnvironment.json
index 2bff7459..85079f06 100644
--- a/Chroma/LightIDTables/TriangleEnvironment.json
+++ b/Chroma/LightIDTables/TriangleEnvironment.json
@@ -12,66 +12,66 @@
     "10": 12
   },
   "2": {
-    "1": 4,
-    "2": 5,
-    "3": 6,
-    "4": 7,
-    "5": 8,
-    "6": 9,
-    "7": 10,
-    "8": 11,
-    "9": 12,
-    "10": 13,
-    "11": 14,
-    "12": 15,
-    "13": 16,
-    "14": 17,
-    "15": 18,
-    "16": 19,
-    "17": 20,
-    "18": 21,
-    "19": 22,
-    "20": 23,
-    "21": 24,
-    "22": 25,
-    "23": 26,
-    "24": 27,
-    "25": 28,
-    "26": 29,
-    "27": 30,
-    "28": 31,
-    "29": 32,
-    "30": 33,
-    "31": 34,
-    "32": 35,
-    "33": 36,
-    "34": 37,
-    "35": 38,
-    "36": 39,
-    "37": 40,
-    "38": 41,
-    "39": 42,
-    "40": 43,
-    "41": 44,
-    "42": 45,
-    "43": 46,
-    "44": 47,
-    "45": 48,
-    "46": 49,
-    "47": 50,
-    "48": 51,
-    "49": 52,
-    "50": 53,
-    "51": 54,
-    "52": 55,
-    "53": 56,
-    "54": 57,
-    "55": 58,
-    "56": 59,
-    "57": 60,
-    "58": 61,
-    "59": 62,
-    "60": 63
+    "1": 6,
+    "2": 7,
+    "3": 8,
+    "4": 9,
+    "5": 10,
+    "6": 11,
+    "7": 12,
+    "8": 13,
+    "9": 14,
+    "10": 15,
+    "11": 16,
+    "12": 17,
+    "13": 18,
+    "14": 19,
+    "15": 20,
+    "16": 21,
+    "17": 22,
+    "18": 23,
+    "19": 24,
+    "20": 25,
+    "21": 26,
+    "22": 27,
+    "23": 28,
+    "24": 29,
+    "25": 30,
+    "26": 31,
+    "27": 32,
+    "28": 33,
+    "29": 34,
+    "30": 35,
+    "31": 36,
+    "32": 37,
+    "33": 38,
+    "34": 39,
+    "35": 40,
+    "36": 41,
+    "37": 42,
+    "38": 43,
+    "39": 44,
+    "40": 45,
+    "41": 46,
+    "42": 47,
+    "43": 48,
+    "44": 49,
+    "45": 50,
+    "46": 51,
+    "47": 52,
+    "48": 53,
+    "49": 54,
+    "50": 55,
+    "51": 56,
+    "52": 57,
+    "53": 58,
+    "54": 59,
+    "55": 60,
+    "56": 61,
+    "57": 62,
+    "58": 63,
+    "59": 64,
+    "60": 65
   },
   "3": {
     "1": 10,