diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json
index 281aa7b4..19c9b540 100644
--- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json
+++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json
@@ -7823,6 +7823,9 @@
         {
           "Comments": "Remove the fuse static mesh from the conveyor belt.",
           "EMType": 25,
+          "Tags": [
+            14
+          ],
           "ClearFromRooms": {
             "227": [
               45
@@ -7832,6 +7835,9 @@
         {
           "Comments": "Add a sprite instead for the ammo.",
           "EMType": 31,
+          "Tags": [
+            14
+          ],
           "ID": 89,
           "Vertex": {
             "Lighting": 4096
diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10B.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10B.PHD-Environment.json
index 1a41610a..aa25732c 100644
--- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10B.PHD-Environment.json
+++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10B.PHD-Environment.json
@@ -7535,6 +7535,9 @@
       "OnTrue": [
         {
           "EMType": 67,
+          "Tags": [
+            14
+          ],
           "BaseLocation": {
             "X": 57856,
             "Y": 10240,
@@ -7542,6 +7545,19 @@
             "Room": 12
           },
           "EntityLocation": 38
+        },
+        {
+          "EMType": 67,
+          "Tags": [
+            13
+          ],
+          "BaseLocation": {
+            "X": 57856,
+            "Y": 10240,
+            "Z": 11776,
+            "Room": 12
+          },
+          "EntityLocation": 38
         }
       ]
     },
diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL3B.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL3B.PHD-Environment.json
index 9dc77a33..00ff351e 100644
--- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL3B.PHD-Environment.json
+++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL3B.PHD-Environment.json
@@ -15,6 +15,9 @@
     {
       "Comments": "Make a slight change to face order in room 37 to make further modifications here easier.",
       "EMType": 32,
+      "Tags": [
+        14
+      ],
       "RoomIndex": 37,
       "Swaps": {
         "27": 42
diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json
index e5fc3bd7..9fbf5980 100644
--- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json
+++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json
@@ -13,6 +13,9 @@
     {
       "Comments": "Make a slight change to face order in room 8 to make further modifications here easier.",
       "EMType": 32,
+      "Tags": [
+        14
+      ],
       "RoomIndex": 8,
       "Swaps": {
         "269": 184,
diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL7B.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL7B.PHD-Environment.json
index d370004e..32da6105 100644
--- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL7B.PHD-Environment.json
+++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL7B.PHD-Environment.json
@@ -7630,6 +7630,9 @@
         {
           "Comments": "Make a side trap room to house the medis. You get nothing for free.",
           "EMType": 126,
+          "Tags": [
+            14
+          ],
           "Location": {
             "X": 26624,
             "Y": -6144,
@@ -7682,6 +7685,9 @@
         {
           "Comments": "Make visibility portals.",
           "EMType": 81,
+          "Tags": [
+            14
+          ],
           "Portals": [
             {
               "BaseRoom": 79,
@@ -7745,6 +7751,9 @@
         },
         {
           "EMType": 82,
+          "Tags": [
+            14
+          ],
           "Portals": {
             "-1": {
               "79": [
@@ -7766,6 +7775,9 @@
         },
         {
           "EMType": 21,
+          "Tags": [
+            14
+          ],
           "TextureMap": {
             "5": {
               "-1": {
@@ -7791,6 +7803,9 @@
         },
         {
           "EMType": 22,
+          "Tags": [
+            14
+          ],
           "GeometryMap": {
             "-1": {
               "Rectangles": [
@@ -7806,6 +7821,9 @@
         },
         {
           "EMType": 128,
+          "Tags": [
+            14
+          ],
           "RoomIndices": [
             -1
           ]
@@ -7861,6 +7879,9 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 38,
           "Intensity": -1,
           "Location": {
@@ -7872,6 +7893,9 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 42,
           "Intensity": -1,
           "Location": {
@@ -7884,6 +7908,9 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 42,
           "Intensity": -1,
           "Location": {
@@ -7896,6 +7923,9 @@
         },
         {
           "EMType": 61,
+          "Tags": [
+            14
+          ],
           "EntityLocation": -2,
           "Trigger": {
             "Mask": 31,
@@ -7914,6 +7944,9 @@
         },
         {
           "EMType": 61,
+          "Tags": [
+            14
+          ],
           "Locations": [
             {
               "X": 28160,
@@ -7937,6 +7970,9 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -7948,6 +7984,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 28800,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -7959,6 +8012,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 28800,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -7970,6 +8040,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 28800,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -7981,6 +8068,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 28800,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -7992,6 +8096,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 60544,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8003,6 +8124,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 60544,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8014,6 +8152,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 60544,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8025,6 +8180,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 60544,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 93,
           "Intensity": 4096,
           "Location": {
@@ -8036,6 +8208,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 93,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8047,6 +8236,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 61312,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8058,6 +8264,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 61312,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8069,6 +8292,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 61312,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8080,6 +8320,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29184,
+            "Y": -6144,
+            "Z": 61312,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8091,6 +8348,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29568,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8102,6 +8376,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29568,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8113,6 +8404,23 @@
         },
         {
           "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29568,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            14
+          ],
           "TypeID": 94,
           "Intensity": 4096,
           "Location": {
@@ -8121,6 +8429,20 @@
             "Z": 55808,
             "Room": -1
           }
+        },
+        {
+          "EMType": 51,
+          "Tags": [
+            13
+          ],
+          "TypeID": 94,
+          "Intensity": 4096,
+          "Location": {
+            "X": 29568,
+            "Y": -6144,
+            "Z": 60928,
+            "Room": 79
+          }
         }
       ]
     }
diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL8B.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL8B.PHD-Environment.json
index 285c0cac..81aa6432 100644
--- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL8B.PHD-Environment.json
+++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL8B.PHD-Environment.json
@@ -35,6 +35,9 @@
     {
       "Comments": "Fix the wrong flipmap trigger type in room 66.",
       "EMType": 69,
+      "Tags": [
+        10
+      ],
       "Locations": [
         {
           "X": 43520,
diff --git a/TRRandomizerCore/Resources/TR2/Environment/FLOATING.TR2-Environment.json b/TRRandomizerCore/Resources/TR2/Environment/FLOATING.TR2-Environment.json
index 8f1dad07..c78ca2b3 100644
--- a/TRRandomizerCore/Resources/TR2/Environment/FLOATING.TR2-Environment.json
+++ b/TRRandomizerCore/Resources/TR2/Environment/FLOATING.TR2-Environment.json
@@ -4,7 +4,8 @@
       "Comments": "Tweak a slope at the end for easier key item exploration, if enabled.",
       "EMType": 7,
       "Tags": [
-        12
+        12,
+        14
       ],
       "Location": {
         "X": 24064,
@@ -19,7 +20,8 @@
     {
       "EMType": 23,
       "Tags": [
-        12
+        12,
+        14
       ],
       "Modifications": [
         {
@@ -61,7 +63,8 @@
     {
       "EMType": 21,
       "Tags": [
-        12
+        12,
+        14
       ],
       "TextureMap": {
         "1557": {
diff --git a/TRRandomizerCore/Resources/TR2/Environment/HOUSE.TR2-Environment.json b/TRRandomizerCore/Resources/TR2/Environment/HOUSE.TR2-Environment.json
index 2fe9a901..5faf2a81 100644
--- a/TRRandomizerCore/Resources/TR2/Environment/HOUSE.TR2-Environment.json
+++ b/TRRandomizerCore/Resources/TR2/Environment/HOUSE.TR2-Environment.json
@@ -3,6 +3,9 @@
     {
       "Comments": "Reposition the unused maze button to the bedroom.",
       "EMType": 44,
+      "Tags": [
+        14
+      ],
       "EntityIndex": 107,
       "TargetLocation": {
         "X": 39424,
@@ -15,6 +18,9 @@
     {
       "Comments": "Use it to turn off the alarms.",
       "EMType": 61,
+      "Tags": [
+        14
+      ],
       "EntityLocation": 107,
       "Trigger": {
         "TrigType": 2,
@@ -33,6 +39,9 @@
     {
       "Comments": "Make an unreachable room for a boulder trigger.",
       "EMType": 126,
+      "Tags": [
+        14
+      ],
       "Location": {
         "X": 67584,
         "Y": 2560,
@@ -57,6 +66,9 @@
     {
       "Comments": "Import the boulder model.",
       "EMType": 145,
+      "Tags": [
+        14
+      ],
       "Data": [
         {
           "ModelID": 60,
@@ -68,12 +80,18 @@
     {
       "Comments": "Convert the zipline handle into a boulder (so we can track the index elsewhere).",
       "EMType": 45,
+      "Tags": [
+        14
+      ],
       "EntityIndex": 23,
       "NewEntityType": 60
     },
     {
       "Comments": "Move it to the hidden room.",
       "EMType": 44,
+      "Tags": [
+        14
+      ],
       "EntityIndex": 23,
       "TargetLocation": {
         "X": 69120,
@@ -85,6 +103,9 @@
     {
       "Comments": "Put a new zipline handle in its place.",
       "EMType": 51,
+      "Tags": [
+        14
+      ],
       "TypeID": 102,
       "Intensity": -1,
       "Location": {
@@ -97,6 +118,9 @@
     {
       "Comments": "Move the initial trigger under Lara to the boulder.",
       "EMType": 67,
+      "Tags": [
+        14
+      ],
       "BaseLocation": {
         "X": 34304,
         "Y": 256,
@@ -108,6 +132,9 @@
     {
       "Comments": "Make it heavy.",
       "EMType": 69,
+      "Tags": [
+        14
+      ],
       "Location": {
         "X": 69120,
         "Y": 2560,
@@ -119,6 +146,9 @@
     {
       "Comments": "Trigger the boulder from the start position. All in all, this means the alarms won't get turned back on.",
       "EMType": 61,
+      "Tags": [
+        14
+      ],
       "Locations": [
         {
           "X": 34304,
@@ -138,6 +168,9 @@
     },
     {
       "EMType": 23,
+      "Tags": [
+        14
+      ],
       "Rotations": [
         {
           "RoomNumber": 8,
diff --git a/TRRandomizerCore/Resources/TR3/Environment/AREA51.TR2-Environment.json b/TRRandomizerCore/Resources/TR3/Environment/AREA51.TR2-Environment.json
index f1c4069f..c4fa5c23 100644
--- a/TRRandomizerCore/Resources/TR3/Environment/AREA51.TR2-Environment.json
+++ b/TRRandomizerCore/Resources/TR3/Environment/AREA51.TR2-Environment.json
@@ -143,6 +143,9 @@
         {
           "Comments": "Remove the hand scanner static mesh.",
           "EMType": 25,
+          "Tags": [
+            14
+          ],
           "ClearFromRooms": {
             "417": [
               0
@@ -316,6 +319,9 @@
         {
           "Comments": "Remove the hand scanner static mesh.",
           "EMType": 25,
+          "Tags": [
+            14
+          ],
           "ClearFromRooms": {
             "417": [
               12
@@ -436,6 +442,9 @@
         {
           "Comments": "Remove the hand scanner static mesh.",
           "EMType": 25,
+          "Tags": [
+            14
+          ],
           "ClearFromRooms": {
             "417": [
               120
diff --git a/TRRandomizerCore/Resources/TR3/Environment/CITY.TR2-Environment.json b/TRRandomizerCore/Resources/TR3/Environment/CITY.TR2-Environment.json
index af91e59e..c83dbfbf 100644
--- a/TRRandomizerCore/Resources/TR3/Environment/CITY.TR2-Environment.json
+++ b/TRRandomizerCore/Resources/TR3/Environment/CITY.TR2-Environment.json
@@ -1096,7 +1096,8 @@
       "Comments": "Replace the wall texture.",
       "EMType": 21,
       "Tags": [
-        12
+        12,
+        14
       ],
       "TextureMap": {
         "1889": {
diff --git a/TRRandomizerCore/Resources/TR3/Environment/COMPOUND.TR2-Environment.json b/TRRandomizerCore/Resources/TR3/Environment/COMPOUND.TR2-Environment.json
index 57a34d2b..80b8e3af 100644
--- a/TRRandomizerCore/Resources/TR3/Environment/COMPOUND.TR2-Environment.json
+++ b/TRRandomizerCore/Resources/TR3/Environment/COMPOUND.TR2-Environment.json
@@ -542,6 +542,9 @@
         {
           "Comments": "Remove the hand scanner static mesh.",
           "EMType": 25,
+          "Tags": [
+            14
+          ],
           "ClearFromRooms": {
             "413": [
               74
diff --git a/TRRandomizerCore/Resources/TR3/Environment/QUADCHAS.TR2-Environment.json b/TRRandomizerCore/Resources/TR3/Environment/QUADCHAS.TR2-Environment.json
index a650af3f..89384d65 100644
--- a/TRRandomizerCore/Resources/TR3/Environment/QUADCHAS.TR2-Environment.json
+++ b/TRRandomizerCore/Resources/TR3/Environment/QUADCHAS.TR2-Environment.json
@@ -529,6 +529,9 @@
       "OnTrue": [
         {
           "EMType": 0,
+          "Tags": [
+            14
+          ],
           "TextureMap": {
             "1487": {
               "167": {