diff --git a/templates/Properties.xml b/templates/Properties.xml
index 37be0626..0cd20e05 100644
--- a/templates/Properties.xml
+++ b/templates/Properties.xml
@@ -2572,7 +2572,7 @@
     <property ID="0x3A2D17E4" name="Knockback Resistance"/>
     <property ID="0x3A2D1AA4" name="WPSC"/>
     <property ID="0x3A32DFCB" name="Unknown"/>
-    <property ID="0x3A3E03BA" name="Unknown"/>
+    <property ID="0x3A3E03BA" name="Collision Scale"/>
     <property ID="0x3A43FB48" name="TrainTrackManagerStructA"/>
     <property ID="0x3A512115" name="STRG"/>
     <property ID="0x3A562EFF" name="Option 3"/>
@@ -3899,7 +3899,7 @@
     <property ID="0x56C0D040" name="Unknown"/>
     <property ID="0x56C192F3" name="ShockWaveInfo"/>
     <property ID="0x56C48141" name="BeastRiderData"/>
-    <property ID="0x56E3CEEF" name="Fade In Time"/>
+    <property ID="0x56E3CEEF" name="Fade Length"/>
     <property ID="0x56EB17BB" name="GenericCreatureStructE"/>
     <property ID="0x56F3C854" name="Unknown"/>
     <property ID="0x56F41CA8" name="Unknown"/>
@@ -8933,7 +8933,7 @@
     <property ID="0xC80BB6E4" name="Unknown"/>
     <property ID="0xC80BC7C5" name="Unknown"/>
     <property ID="0xC80E329B" name="Attack Time Variation"/>
-    <property ID="0xC80FC827" name="Multiplayer-related"/>
+    <property ID="0xC80FC827" name="Time"/>
     <property ID="0xC81690CB" name="Unknown"/>
     <property ID="0xC82395FA" name="CameraHintStructB"/>
     <property ID="0xC83E3228" name="Unknown"/>
@@ -10227,7 +10227,7 @@
     <property ID="0xE578EFC6" name="Unknown"/>
     <property ID="0xE57CA27C" name="Unknown"/>
     <property ID="0xE5839374" name="Unknown"/>
-    <property ID="0xE585F166" name="Unknown"/>
+    <property ID="0xE585F166" name="Spawn Delay"/>
     <property ID="0xE589A4F9" name="Unknown"/>
     <property ID="0xE58A4113" name="Unknown"/>
     <property ID="0xE58D6C84" name="Unknown"/>
diff --git a/templates/mp1/Enums/InventorySlot.xml b/templates/mp1/Enums/Item.xml
similarity index 98%
rename from templates/mp1/Enums/InventorySlot.xml
rename to templates/mp1/Enums/Item.xml
index a28d4ddf..093ea367 100644
--- a/templates/mp1/Enums/InventorySlot.xml
+++ b/templates/mp1/Enums/Item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<enum name="InventorySlot">
+<enum name="Item">
     <enumerators>
         <enumerator ID="0x00" name="Power Beam"/>
         <enumerator ID="0x01" name="Ice Beam"/>
diff --git a/templates/mp1/Enums/PlayerAction.xml b/templates/mp1/Enums/PlayerAction.xml
index e7e9c235..bce3edb0 100644
--- a/templates/mp1/Enums/PlayerAction.xml
+++ b/templates/mp1/Enums/PlayerAction.xml
@@ -1,70 +1,72 @@
 <?xml version="1.0" ?>
 <enum name="PlayerAction">
-    <enumerator ID="0x00" name="Forward" />
-    <enumerator ID="0x01" name="Backward" />
-    <enumerator ID="0x02" name="Turn Left" />
-    <enumerator ID="0x03" name="Turn Right" />
-    <enumerator ID="0x04" name="Strafe Left" />
-    <enumerator ID="0x05" name="Strafe Right" />
-    <enumerator ID="0x06" name="Look Left" />
-    <enumerator ID="0x07" name="Look Right" />
-    <enumerator ID="0x08" name="Look Up" />
-    <enumerator ID="0x09" name="Look Down" />
-    <enumerator ID="0x0A" name="Jump/Boost" />
-    <enumerator ID="0x0B" name="Fire/Bomb" />
-    <enumerator ID="0x0C" name="Missile/PowerBomb" />
-    <enumerator ID="0x0D" name="Morph" />
-    <enumerator ID="0x0E" name="Aim Up" />
-    <enumerator ID="0x0F" ame="Aim Down" />
-    <enumerator ID="0x10" name="Cycle Beam Up" />
-    <enumerator ID="0x11" name="Cycle Beam Down" />
-    <enumerator ID="0x12" name="Cycle Item" />
-    <enumerator ID="0x13" name="Power Beam" />
-    <enumerator ID="0x14" name="Ice Beam" />
-    <enumerator ID="0x15" name="Wave Beam" />
-    <enumerator ID="0x16" name="Plasma Beam" />
-    <enumerator ID="0x17" name="Toggle Holster" />
-    <enumerator ID="0x18" name="Orbit Close" />
-    <enumerator ID="0x19" name="Orbit Far" />
-    <enumerator ID="0x1A" name="Orbit Object" />
-    <enumerator ID="0x1B" name="Orbit Select" />
-    <enumerator ID="0x1C" name="Orbit Confirm" />
-    <enumerator ID="0x1D" name="Orbit Left" />
-    <enumerator ID="0x1E" name="Orbit Right" />
-    <enumerator ID="0x1F" name="Orbit Up" />
-    <enumerator ID="0x20" name="Orbit Down" />
-    <enumerator ID="0x21" name="Look Hold1" />
-    <enumerator ID="0x22" name="Look Hold2" />
-    <enumerator ID="0x23" name="Look Zoom In" />
-    <enumerator ID="0x24" name="Look Zoom Out" />
-    <enumerator ID="0x25" name="Aim Hold" />
-    <enumerator ID="0x26" name="Map Circle Up" />
-    <enumerator ID="0x27" name="Map Circle Down" />
-    <enumerator ID="0x28" name="Map Circle Left" />
-    <enumerator ID="0x29" name="Map Circle Right" />
-    <enumerator ID="0x2A" name="Map Move Forward" />
-    <enumerator ID="0x2B" name="Map Move Back" />
-    <enumerator ID="0x2C" name="Map Move Left" />
-    <enumerator ID="0x2D" name="Map Move Right" />
-    <enumerator ID="0x2E" name="Map Zoom In" />
-    <enumerator ID="0x2F" name="Map Zoom Out" />
-    <enumerator ID="0x30" name="SpiderBall" />
-    <enumerator ID="0x31" name="Chase Camera" />
-    <enumerator ID="0x32" name="XRay Visor" />
-    <enumerator ID="0x33" name="Thermo Visor" />
-    <enumerator ID="0x34" name="Enviro Visor" />
-    <enumerator ID="0x35" name="No Visor" />
-    <enumerator ID="0x36" name="Visor Menu" />
-    <enumerator ID="0x37" name="Visor Up" />
-    <enumerator ID="0x38" name="Visor Down" />
-    <enumerator ID="0x39" name="UNKNOWN" />
-    <enumerator ID="0x3A" name="UNKNOWN" />
-    <enumerator ID="0x3B" name="Use Shield" />
-    <enumerator ID="0x3C" name="Scan Item" />
-    <enumerator ID="0x3D" name="UNKNOWN" />
-    <enumerator ID="0x3E" name="UNKNOWN" />
-    <enumerator ID="0x3F" name="UNKNOWN" />
-    <enumerator ID="0x40" name="UNKNOWN" />
-    <enumerator ID="0x41" name="UNKNOWN" />
-    <enumerator ID="0x42" name="UNKNOWN" />
+    <enumerators>
+        <enumerator ID="0x00" name="Forward" />
+        <enumerator ID="0x01" name="Backward" />
+        <enumerator ID="0x02" name="Turn Left" />
+        <enumerator ID="0x03" name="Turn Right" />
+        <enumerator ID="0x04" name="Strafe Left" />
+        <enumerator ID="0x05" name="Strafe Right" />
+        <enumerator ID="0x06" name="Look Left" />
+        <enumerator ID="0x07" name="Look Right" />
+        <enumerator ID="0x08" name="Look Up" />
+        <enumerator ID="0x09" name="Look Down" />
+        <enumerator ID="0x0A" name="Jump/Boost" />
+        <enumerator ID="0x0B" name="Fire/Bomb" />
+        <enumerator ID="0x0C" name="Missile/PowerBomb" />
+        <enumerator ID="0x0D" name="Morph" />
+        <enumerator ID="0x0E" name="Aim Up" />
+        <enumerator ID="0x0F" name="Aim Down" />
+        <enumerator ID="0x10" name="Cycle Beam Up" />
+        <enumerator ID="0x11" name="Cycle Beam Down" />
+        <enumerator ID="0x12" name="Cycle Item" />
+        <enumerator ID="0x13" name="Power Beam" />
+        <enumerator ID="0x14" name="Ice Beam" />
+        <enumerator ID="0x15" name="Wave Beam" />
+        <enumerator ID="0x16" name="Plasma Beam" />
+        <enumerator ID="0x17" name="Toggle Holster" />
+        <enumerator ID="0x18" name="Orbit Close" />
+        <enumerator ID="0x19" name="Orbit Far" />
+        <enumerator ID="0x1A" name="Orbit Object" />
+        <enumerator ID="0x1B" name="Orbit Select" />
+        <enumerator ID="0x1C" name="Orbit Confirm" />
+        <enumerator ID="0x1D" name="Orbit Left" />
+        <enumerator ID="0x1E" name="Orbit Right" />
+        <enumerator ID="0x1F" name="Orbit Up" />
+        <enumerator ID="0x20" name="Orbit Down" />
+        <enumerator ID="0x21" name="Look Hold1" />
+        <enumerator ID="0x22" name="Look Hold2" />
+        <enumerator ID="0x23" name="Look Zoom In" />
+        <enumerator ID="0x24" name="Look Zoom Out" />
+        <enumerator ID="0x25" name="Aim Hold" />
+        <enumerator ID="0x26" name="Map Circle Up" />
+        <enumerator ID="0x27" name="Map Circle Down" />
+        <enumerator ID="0x28" name="Map Circle Left" />
+        <enumerator ID="0x29" name="Map Circle Right" />
+        <enumerator ID="0x2A" name="Map Move Forward" />
+        <enumerator ID="0x2B" name="Map Move Back" />
+        <enumerator ID="0x2C" name="Map Move Left" />
+        <enumerator ID="0x2D" name="Map Move Right" />
+        <enumerator ID="0x2E" name="Map Zoom In" />
+        <enumerator ID="0x2F" name="Map Zoom Out" />
+        <enumerator ID="0x30" name="SpiderBall" />
+        <enumerator ID="0x31" name="Chase Camera" />
+        <enumerator ID="0x32" name="XRay Visor" />
+        <enumerator ID="0x33" name="Thermo Visor" />
+        <enumerator ID="0x34" name="Enviro Visor" />
+        <enumerator ID="0x35" name="No Visor" />
+        <enumerator ID="0x36" name="Visor Menu" />
+        <enumerator ID="0x37" name="Visor Up" />
+        <enumerator ID="0x38" name="Visor Down" />
+        <enumerator ID="0x39" name="UNKNOWN" />
+        <enumerator ID="0x3A" name="UNKNOWN" />
+        <enumerator ID="0x3B" name="Use Shield" />
+        <enumerator ID="0x3C" name="Scan Item" />
+        <enumerator ID="0x3D" name="UNKNOWN" />
+        <enumerator ID="0x3E" name="UNKNOWN" />
+        <enumerator ID="0x3F" name="UNKNOWN" />
+        <enumerator ID="0x40" name="UNKNOWN" />
+        <enumerator ID="0x41" name="UNKNOWN" />
+        <enumerator ID="0x42" name="UNKNOWN" />
+    </enumerators>
 </enum>
diff --git a/templates/mp1/Enums/VulnerabilityType.xml b/templates/mp1/Enums/VulnerabilityType.xml
index c6f59b49..5934b074 100644
--- a/templates/mp1/Enums/VulnerabilityType.xml
+++ b/templates/mp1/Enums/VulnerabilityType.xml
@@ -8,5 +8,6 @@
         <enumerator ID="0x04" name="Pass Through"/>
         <enumerator ID="0x05" name="Direct/Double"/>
         <enumerator ID="0x06" name="Direct"/>
+        <enumerator ID="0x07" name="Immune?"/>
     </enumerators>
 </enum>
diff --git a/templates/mp1/Script/Actor.xml b/templates/mp1/Script/Actor.xml
index 9b4411e5..12dd1479 100644
--- a/templates/mp1/Script/Actor.xml
+++ b/templates/mp1/Script/Actor.xml
@@ -19,7 +19,7 @@
         <property ID="0x0E" name="Unknown 5" type="bool"/>
         <property ID="0x0F" name="Unknown 6" type="bool"/>
         <property ID="0x10" name="Unknown 7" type="bool"/>
-        <property ID="0x11" name="Unknown 8" type="bool"/>
+        <property ID="0x11" name="Active" type="bool"/>
         <property ID="0x12" name="Unknown 9" type="long"/>
         <property ID="0x13" name="Unknown 10" type="float"/>
         <property ID="0x14" name="Unknown 11" type="bool"/>
diff --git a/templates/mp1/Script/ActorContraption.xml b/templates/mp1/Script/ActorContraption.xml
index 7a07a2a6..04869695 100644
--- a/templates/mp1/Script/ActorContraption.xml
+++ b/templates/mp1/Script/ActorContraption.xml
@@ -16,7 +16,7 @@
         <struct ID="0x0B" name="ActorParameters" template="Structs/ActorParameters.xml"/>
         <property ID="0x0C" name="Particle" type="file" extensions="PART"/>
         <struct ID="0x0D" name="DamageInfo" template="Structs/DamageInfo.xml"/>
-        <property ID="0x0E" name="Unknown 4" type="bool"/>
+        <property ID="0x0E" name="Active" type="bool"/>
     </properties>
     <states/>
     <messages/>
@@ -26,6 +26,7 @@
             <property name="Position" ID="0x01"/>
             <property name="Rotation" ID="0x02"/>
             <property name="Scale" ID="0x03"/>
+            <property name="Active" ID="0x0E"/>
             <property name="LightParameters" ID="0x0B:0x00"/>
         </properties>
         <assets>
diff --git a/templates/mp1/Script/AmbientAI.xml b/templates/mp1/Script/AmbientAI.xml
index 74e2dd4c..aaa7d9b2 100644
--- a/templates/mp1/Script/AmbientAI.xml
+++ b/templates/mp1/Script/AmbientAI.xml
@@ -17,7 +17,7 @@
         <property ID="0x0C" name="Unknown 4" type="float"/>
         <property ID="0x0D" name="Unknown 5" type="long"/>
         <property ID="0x0E" name="Unknown 6" type="long"/>
-        <property ID="0x0F" name="Unknown 7" type="bool"/>
+        <property ID="0x0F" name="Active" type="bool"/>
     </properties>
     <states/>
     <messages/>
@@ -27,6 +27,7 @@
             <property name="Position" ID="0x01"/>
             <property name="Rotation" ID="0x02"/>
             <property name="Scale" ID="0x03"/>
+            <property name="Active" ID="0x0F"/>
             <property name="LightParameters" ID="0x0A:0x00"/>
         </properties>
         <assets>
diff --git a/templates/mp1/Script/AreaAttributes.xml b/templates/mp1/Script/AreaAttributes.xml
index 9c135e5d..bf3d86e1 100644
--- a/templates/mp1/Script/AreaAttributes.xml
+++ b/templates/mp1/Script/AreaAttributes.xml
@@ -2,21 +2,29 @@
 <ScriptTemplate version="4">
     <name>AreaAttributes</name>
     <properties>
-        <property ID="0x00" name="Unknown 1" type="long"/>
-        <property ID="0x01" name="Show Skybox?" type="bool"/>
+        <property ID="0x00" name="Unknown" type="long">
+            <description>If set to anything other than 1, AreaAttributes will not work.</description>
+        </property>
+        <property ID="0x01" name="Show Skybox" type="bool"/>
         <enum ID="0x02" name="Environmental Effect">
             <enumerators>
                 <enumerator ID="0x00" name="None"/>
-                <enumerator ID="0x01" name="Rain"/>
-                <enumerator ID="0x02" name="Snow"/>
+                <enumerator ID="0x01" name="Snow"/>
+                <enumerator ID="0x02" name="Rain"/>
             </enumerators>
         </enum>
-        <property ID="0x03" name="Unknown 3" type="float"/>
-        <property ID="0x04" name="Unknown 4" type="float"/>
-        <property ID="0x05" name="Unknown 5" type="float"/>
-        <property ID="0x06" name="Unknown 6" type="float"/>
+        <property ID="0x03" name="Initial Environmental Effect Density" type="float"/>
+        <property ID="0x04" name="Initial Thermal Heat Level" type="float"/>
+        <property ID="0x05" name="X-Ray Fog Distance" type="float"/>
+        <property ID="0x06" name="Initial World Lighting Level" type="float"/>
         <property ID="0x07" name="Skybox Model" type="file" extensions="CMDL"/>
-        <property ID="0x08" name="Unknown 7" type="long"/>
+        <enum ID="0x08" name="Phazon Type">
+            <enumerators>
+                <enumerator ID="0x00" name="None"/>
+                <enumerator ID="0x01" name="Blue"/>
+                <enumerator ID="0x02" name="Orange"/>
+            </enumerators>
+        </enum>
     </properties>
     <states/>
     <messages/>
diff --git a/templates/mp1/Script/Beetle.xml b/templates/mp1/Script/Beetle.xml
index 540fdfc7..395af9d8 100644
--- a/templates/mp1/Script/Beetle.xml
+++ b/templates/mp1/Script/Beetle.xml
@@ -10,11 +10,13 @@
         <struct ID="0x05" name="PatternedInfo" template="Structs/PatternedInfo.xml"/>
         <struct ID="0x06" name="ActorParameters" template="Structs/ActorParameters.xml"/>
         <struct ID="0x07" name="DamageInfo" template="Structs/DamageInfo.xml"/>
-        <property ID="0x08" name="Unknown 2" type="vector3f"/>
+        <property ID="0x08" name="Lock-On Offset" type="vector3f">
+            <description>This is clamped to the beetle's bounding box.</description>
+        </property>
         <property ID="0x09" name="Unknown 3" type="float"/>
         <struct ID="0x0A" name="Abdomen Vulnerability" template="Structs/DamageVulnerability.xml"/>
         <struct ID="0x0B" name="Armor Vulnerability" template="Structs/DamageVulnerability.xml"/>
-        <property ID="0x0C" name="Model" type="file" extensions="CMDL"/>
+        <property ID="0x0C" name="Abdomen Model" type="file" extensions="CMDL"/>
         <property ID="0x0D" name="Unknown 4" type="long"/>
         <property ID="0x0E" name="Unknown 5" type="float"/>
         <property ID="0x0F" name="Unknown 6" type="float"/>
diff --git a/templates/mp1/Script/CameraBlurKeyframe.xml b/templates/mp1/Script/CameraBlurKeyframe.xml
index 1d4a61f4..75e9b13b 100644
--- a/templates/mp1/Script/CameraBlurKeyframe.xml
+++ b/templates/mp1/Script/CameraBlurKeyframe.xml
@@ -3,7 +3,7 @@
     <name>CameraBlurKeyframe</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
-        <property ID="0x01" name="Unknown 1" type="bool"/>
+        <property ID="0x01" name="Active" type="bool"/>
         <property ID="0x02" name="Unknown 2" type="long"/>
         <property ID="0x03" name="Unknown 3" type="float"/>
         <property ID="0x04" name="Unknown 4" type="long"/>
@@ -15,6 +15,7 @@
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x01"/>
         </properties>
         <assets>
             <billboard source="file">script/common/CameraBlurKeyframe.txtr</billboard>
diff --git a/templates/mp1/Script/CameraFilterKeyframe.xml b/templates/mp1/Script/CameraFilterKeyframe.xml
index f4796745..0fc5008b 100644
--- a/templates/mp1/Script/CameraFilterKeyframe.xml
+++ b/templates/mp1/Script/CameraFilterKeyframe.xml
@@ -3,21 +3,22 @@
     <name>CameraFilterKeyframe</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
-        <property ID="0x01" name="Unknown 1" type="bool"/>
-        <property ID="0x02" name="Unknown 2" type="long"/>
-        <property ID="0x03" name="Unknown 3" type="long"/>
+        <property ID="0x01" name="Active" type="bool"/>
+        <property ID="0x02" name="Filter Type" type="long"/>
+        <property ID="0x03" name="Filter Shape" type="long"/>
         <property ID="0x04" name="Unknown 4" type="long"/>
         <property ID="0x05" name="Unknown 5" type="long"/>
-        <property ID="0x06" name="Unknown 6" type="color"/>
-        <property ID="0x07" name="Unknown 7" type="float"/>
-        <property ID="0x08" name="Unknown 8" type="float"/>
-        <property ID="0x09" name="Texture" type="file" extensions="TXTR"/>
+        <property ID="0x06" name="Filter Color" type="color"/>
+        <property ID="0x07" name="Fade-In Duration" type="float"/>
+        <property ID="0x08" name="Fade-Out Duration" type="float"/>
+        <property ID="0x09" name="Overlay Texture" type="file" extensions="TXTR"/>
     </properties>
     <states/>
     <messages/>
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x01"/>
         </properties>
         <assets>
             <billboard source="file">script/common/CameraFilterKeyframe.txtr</billboard>
diff --git a/templates/mp1/Script/CameraPitchVolume.xml b/templates/mp1/Script/CameraPitchVolume.xml
index e5e2a16a..02772783 100644
--- a/templates/mp1/Script/CameraPitchVolume.xml
+++ b/templates/mp1/Script/CameraPitchVolume.xml
@@ -6,7 +6,7 @@
         <property ID="0x01" name="Position" type="vector3f"/>
         <property ID="0x02" name="Rotation" type="vector3f"/>
         <property ID="0x03" name="Scale" type="vector3f"/>
-        <property ID="0x04" name="Unknown 1" type="bool"/>
+        <property ID="0x04" name="Active" type="bool"/>
         <property ID="0x05" name="Unknown 2" type="float"/>
         <property ID="0x06" name="Unknown 3" type="float"/>
         <property ID="0x07" name="Unknown 4" type="float"/>
@@ -19,6 +19,7 @@
             <property name="Position" ID="0x01"/>
             <property name="Rotation" ID="0x02"/>
             <property name="Scale" ID="0x03"/>
+            <property name="Active" ID="0x04"/>
         </properties>
         <assets/>
         <rotation_type>enabled</rotation_type>
diff --git a/templates/mp1/Script/CameraShaker.xml b/templates/mp1/Script/CameraShaker.xml
index eefc8268..3d1aab75 100644
--- a/templates/mp1/Script/CameraShaker.xml
+++ b/templates/mp1/Script/CameraShaker.xml
@@ -10,13 +10,14 @@
         <property ID="0x05" name="Unknown 5" type="float"/>
         <property ID="0x06" name="Unknown 6" type="float"/>
         <property ID="0x07" name="Unknown 7" type="float"/>
-        <property ID="0x08" name="Unknown 8" type="bool"/>
+        <property ID="0x08" name="Active" type="bool"/>
     </properties>
     <states/>
     <messages/>
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x08"/>
         </properties>
         <assets/>
         <rotation_type>disabled</rotation_type>
diff --git a/templates/mp1/Script/CameraWaypoint.xml b/templates/mp1/Script/CameraWaypoint.xml
index 5963f99f..ead7e2d6 100644
--- a/templates/mp1/Script/CameraWaypoint.xml
+++ b/templates/mp1/Script/CameraWaypoint.xml
@@ -5,7 +5,7 @@
         <property ID="0x00" name="Name" type="string"/>
         <property ID="0x01" name="Position" type="vector3f"/>
         <property ID="0x02" name="Rotation" type="vector3f"/>
-        <property ID="0x03" name="Unknown 1" type="bool"/>
+        <property ID="0x03" name="Active" type="bool"/>
         <property ID="0x04" name="Unknown 2" type="float"/>
         <property ID="0x05" name="Unknown 3" type="long"/>
     </properties>
@@ -16,6 +16,7 @@
             <property name="InstanceName" ID="0x00"/>
             <property name="Position" ID="0x01"/>
             <property name="Rotation" ID="0x02"/>
+            <property name="Active" ID="0x03"/>
         </properties>
         <assets>
             <model source="file">script/common/CameraWaypoint.cmdl</model>
diff --git a/templates/mp1/Script/ControllerAction.xml b/templates/mp1/Script/ControllerAction.xml
index af8fd10f..07bd3b84 100644
--- a/templates/mp1/Script/ControllerAction.xml
+++ b/templates/mp1/Script/ControllerAction.xml
@@ -3,15 +3,16 @@
     <name>ControllerAction</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
-        <property ID="0x01" name="Unknown 1" type="bool"/>
-        <property ID="0x02" name="Unknown 2" type="long"/>
-        <property ID="0x03" name="Unknown 3" type="bool"/>
+        <property ID="0x01" name="Active" type="bool"/>
+        <enum ID="0x02" name="Action" template="Enums/PlayerAction.xml"/>
+        <property ID="0x03" name="Deactivate When Used" type="bool"/>
     </properties>
     <states/>
     <messages/>
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x01"/>
         </properties>
         <assets/>
         <rotation_type>disabled</rotation_type>
diff --git a/templates/mp1/Script/Counter.xml b/templates/mp1/Script/Counter.xml
index 42edda39..c6d77bbe 100644
--- a/templates/mp1/Script/Counter.xml
+++ b/templates/mp1/Script/Counter.xml
@@ -3,16 +3,17 @@
     <name>Counter</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
-        <property ID="0x01" name="Start value?" type="long"/>
-        <property ID="0x02" name="Max value?" type="long"/>
-        <property ID="0x03" name="Unknown 1" type="bool"/>
-        <property ID="0x04" name="Unknown 2" type="bool"/>
+        <property ID="0x01" name="Start Value" type="long"/>
+        <property ID="0x02" name="Max Value" type="long"/>
+        <property ID="0x03" name="Reset When Max/Zero Reached" type="bool"/>
+        <property ID="0x04" name="Active" type="bool"/>
     </properties>
     <states/>
     <messages/>
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x04"/>
         </properties>
         <assets>
             <billboard source="file">script/common/Counter.txtr</billboard>
diff --git a/templates/mp1/Script/DoorArea.xml b/templates/mp1/Script/DoorArea.xml
index 7af645e2..488d71f4 100644
--- a/templates/mp1/Script/DoorArea.xml
+++ b/templates/mp1/Script/DoorArea.xml
@@ -8,13 +8,13 @@
         <property ID="0x03" name="Scale" type="vector3f"/>
         <property ID="0x04" name="AnimationParameters" type="character"/>
         <struct ID="0x05" name="ActorParameters" template="Structs/ActorParameters.xml"/>
-        <property ID="0x06" name="Unknown 1" type="vector3f"/>
-        <property ID="0x07" name="Unknown 2" type="vector3f"/>
-        <property ID="0x08" name="Unknown 3" type="vector3f"/>
-        <property ID="0x09" name="Unknown 4" type="bool"/>
-        <property ID="0x0A" name="Unknown 5" type="bool"/>
+        <property ID="0x06" name="Scan Offset" type="vector3f"/>
+        <property ID="0x07" name="Collision Size" type="vector3f"/>
+        <property ID="0x08" name="Collision Offset" type="vector3f"/>
+        <property ID="0x09" name="Active" type="bool"/>
+        <property ID="0x0A" name="Open" type="bool"/>
         <property ID="0x0B" name="Unknown 6" type="bool"/>
-        <property ID="0x0C" name="Unknown 7" type="float"/>
+        <property ID="0x0C" name="Open/Close Animation Length" type="float"/>
         <property ID="0x0D" name="Unknown 8" type="bool"/>
     </properties>
     <states/>
diff --git a/templates/mp1/Script/EnvFxDensityController.xml b/templates/mp1/Script/EnvFxDensityController.xml
index fe9324fa..33645268 100644
--- a/templates/mp1/Script/EnvFxDensityController.xml
+++ b/templates/mp1/Script/EnvFxDensityController.xml
@@ -3,15 +3,16 @@
     <name>EnvFxDensityController</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
-        <property ID="0x01" name="Unknown 1" type="bool"/>
-        <property ID="0x02" name="Unknown 2" type="float"/>
-        <property ID="0x03" name="Unknown 3" type="long"/>
+        <property ID="0x01" name="Active" type="bool"/>
+        <property ID="0x02" name="Density" type="float"/>
+        <property ID="0x03" name="Unknown" type="long"/>
     </properties>
     <states/>
     <messages/>
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x01"/>
         </properties>
         <assets/>
         <rotation_type>disabled</rotation_type>
diff --git a/templates/mp1/Script/Generator.xml b/templates/mp1/Script/Generator.xml
index 130e8c6c..a2ca2c92 100644
--- a/templates/mp1/Script/Generator.xml
+++ b/templates/mp1/Script/Generator.xml
@@ -8,8 +8,8 @@
         <property ID="0x03" name="Unknown 3" type="bool"/>
         <property ID="0x04" name="Unknown 4" type="vector3f"/>
         <property ID="0x05" name="Unknown 5" type="bool"/>
-        <property ID="0x06" name="Unknown 6" type="float"/>
-        <property ID="0x07" name="Unknown 7" type="float"/>
+        <property ID="0x06" name="Min Scale Multiplier" type="float"/>
+        <property ID="0x07" name="Max Scale Multiplier" type="float"/>
     </properties>
     <states/>
     <messages/>
diff --git a/templates/mp1/Script/Pickup.xml b/templates/mp1/Script/Pickup.xml
index 17c78200..aa1deabe 100644
--- a/templates/mp1/Script/Pickup.xml
+++ b/templates/mp1/Script/Pickup.xml
@@ -6,19 +6,19 @@
         <property ID="0x01" name="Position" type="vector3f"/>
         <property ID="0x02" name="Rotation" type="vector3f"/>
         <property ID="0x03" name="Scale" type="vector3f"/>
-        <property ID="0x04" name="Hitbox size" type="vector3f"/>
-        <property ID="0x05" name="Scan position" type="vector3f"/>
-        <enum ID="0x06" name="Pickup Type" template="Enums/InventorySlot.xml"/>
+        <property ID="0x04" name="Collision Scale" type="vector3f"/>
+        <property ID="0x05" name="Scan/Collision Offset" type="vector3f"/>
+        <enum ID="0x06" name="Item" template="Enums/Item.xml"/>
         <property ID="0x07" name="Capacity" type="long"/>
         <property ID="0x08" name="Amount" type="long"/>
-        <property ID="0x09" name="Drop rate" type="float"/>
-        <property ID="0x0A" name="Life time" type="float"/>
-        <property ID="0x0B" name="Spawn delay" type="float"/>
+        <property ID="0x09" name="Drop Rate" type="float"/>
+        <property ID="0x0A" name="Life Time" type="float"/>
+        <property ID="0x0B" name="Fade Length" type="float"/>
         <property ID="0x0C" name="Model" type="file" extensions="CMDL"/>
         <property ID="0x0D" name="AnimationParameters" type="character"/>
         <struct ID="0x0E" name="ActorParameters" template="Structs/ActorParameters.xml"/>
         <property ID="0x0F" name="Active" type="bool"/>
-        <property ID="0x10" name="Unknown 1" type="float"/>
+        <property ID="0x10" name="Spawn Delay" type="float"/>
         <property ID="0x11" name="Particle" type="file" extensions="PART"/>
     </properties>
     <states/>
diff --git a/templates/mp1/Script/PlayerStateChange.xml b/templates/mp1/Script/PlayerStateChange.xml
index c48296c0..4f7209f9 100644
--- a/templates/mp1/Script/PlayerStateChange.xml
+++ b/templates/mp1/Script/PlayerStateChange.xml
@@ -3,10 +3,10 @@
     <name>PlayerStateChange</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
-        <property ID="0x01" name="Unknown 1" type="bool"/>
-        <enum ID="0x02" name="Inventory Slot" template="Enums/InventorySlot.xml"/>
-        <property ID="0x03" name="Unknown 2" type="long"/>
-        <property ID="0x04" name="Unknown 3" type="long"/>
+        <property ID="0x01" name="Active" type="bool"/>
+        <enum ID="0x02" name="Item" template="Enums/Item.xml"/>
+        <property ID="0x03" name="Amount" type="long"/>
+        <property ID="0x04" name="Capacity" type="long"/>
         <property ID="0x05" name="Unknown 4" type="long"/>
         <property ID="0x06" name="Unknown 5" type="long"/>
     </properties>
@@ -15,6 +15,7 @@
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x01"/>
         </properties>
         <assets/>
         <rotation_type>disabled</rotation_type>
diff --git a/templates/mp1/Script/PointOfInterest.xml b/templates/mp1/Script/PointOfInterest.xml
index 535e96dc..044d98ed 100644
--- a/templates/mp1/Script/PointOfInterest.xml
+++ b/templates/mp1/Script/PointOfInterest.xml
@@ -5,9 +5,11 @@
         <property ID="0x00" name="Name" type="string"/>
         <property ID="0x01" name="Position" type="vector3f"/>
         <property ID="0x02" name="Rotation" type="vector3f"/>
-        <property ID="0x03" name="Unknown 1" type="bool"/>
+        <property ID="0x03" name="Active" type="bool"/>
         <struct ID="0x04" name="ScannableParameters" template="Structs/ScannableParameters.xml"/>
-        <property ID="0x05" name="Unknown 2" type="float"/>
+        <property ID="0x05" name="Unknown" type="float">
+            <description>Affects the size of the scan point.</description>
+        </property>
     </properties>
     <states/>
     <messages/>
@@ -16,6 +18,7 @@
             <property name="InstanceName" ID="0x00"/>
             <property name="Position" ID="0x01"/>
             <property name="Rotation" ID="0x02"/>
+            <property name="Active" ID="0x03"/>
         </properties>
         <assets>
             <billboard source="file">script/common/PointOfInterest.txtr</billboard>
diff --git a/templates/mp1/Script/RandomRelay.xml b/templates/mp1/Script/RandomRelay.xml
index b969b068..fdc7e96c 100644
--- a/templates/mp1/Script/RandomRelay.xml
+++ b/templates/mp1/Script/RandomRelay.xml
@@ -3,16 +3,17 @@
     <name>RandomRelay</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
-        <property ID="0x01" name="Unknown 1" type="long"/>
-        <property ID="0x02" name="Unknown 2" type="long"/>
-        <property ID="0x03" name="Unknown 3" type="bool"/>
-        <property ID="0x04" name="Unknown 4" type="bool"/>
+        <property ID="0x01" name="Connection Count" type="long"/>
+        <property ID="0x02" name="Variance" type="long"/>
+        <property ID="0x03" name="Unknown" type="bool"/>
+        <property ID="0x04" name="Active" type="bool"/>
     </properties>
     <states/>
     <messages/>
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x04"/>
         </properties>
         <assets>
             <billboard source="file">script/common/RandomRelay.txtr</billboard>
diff --git a/templates/mp1/Script/SpecialFunction.xml b/templates/mp1/Script/SpecialFunction.xml
index ef153e6d..9e855060 100644
--- a/templates/mp1/Script/SpecialFunction.xml
+++ b/templates/mp1/Script/SpecialFunction.xml
@@ -7,7 +7,7 @@
         <property ID="0x02" name="Rotation" type="vector3f"/>
         <enum ID="0x03" name="Function">
             <enumerators>
-                <enumerator ID="0x00" name="What"/>
+                <enumerator ID="0x00" name="Function 0"/>
                 <enumerator ID="0x01" name="Player Follow Locator"/>
                 <enumerator ID="0x02" name="Spinner Controller"/>
                 <enumerator ID="0x03" name="Object Follow Locator"/>
@@ -52,7 +52,7 @@
                 <property ID="0x01" name="Layer no" type="long"/>
             </properties>
         </struct>
-        <enum ID="0x09" name="Inventory Slot" template="Enums/InventorySlot.xml"/>
+        <enum ID="0x09" name="Item" template="Enums/Item.xml"/>
         <property ID="0x0A" name="Active" type="bool"/>
         <property ID="0x0B" name="Unknown 5" type="float"/>
         <property ID="0x0C" name="Used by SpinnerController 1" type="long"/>
diff --git a/templates/mp1/Script/WorldTeleporter.xml b/templates/mp1/Script/WorldTeleporter.xml
index 989bfcf8..7f02d05b 100644
--- a/templates/mp1/Script/WorldTeleporter.xml
+++ b/templates/mp1/Script/WorldTeleporter.xml
@@ -3,32 +3,33 @@
     <name>WorldTeleporter</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
-        <property ID="0x01" name="Unknown 1" type="bool"/>
-        <property ID="0x02" name="MLVL" type="file" extensions="MLVL"/>
-        <property ID="0x03" name="MREA" type="file" extensions="MREA"/>
-        <property ID="0x04" name="AnimationParameters" type="character"/>
-        <property ID="0x05" name="Unknown 2" type="vector3f"/>
-        <property ID="0x06" name="Model 1" type="file" extensions="CMDL"/>
-        <property ID="0x07" name="Unknown 3" type="vector3f"/>
-        <property ID="0x08" name="Model 2" type="file" extensions="CMDL"/>
-        <property ID="0x09" name="Unknown 4" type="vector3f"/>
-        <property ID="0x0A" name="Unknown 5" type="bool"/>
-        <property ID="0x0B" name="Sound?" type="long"/>
-        <property ID="0x0C" name="Unknown 6" type="long"/>
-        <property ID="0x0D" name="Unknown 7" type="long"/>
-        <property ID="0x0E" name="Unknown 8" type="bool"/>
-        <property ID="0x0F" name="FONT" type="file" extensions="FONT"/>
-        <property ID="0x10" name="STRG" type="file" extensions="STRG"/>
-        <property ID="0x11" name="Unknown 9" type="bool"/>
-        <property ID="0x12" name="Unknown 10" type="float"/>
-        <property ID="0x13" name="Unknown 11" type="float"/>
-        <property ID="0x14" name="Unknown 12" type="float"/>
+        <property ID="0x01" name="Active" type="bool"/>
+        <property ID="0x02" name="World" type="file" extensions="MLVL"/>
+        <property ID="0x03" name="Area" type="file" extensions="MREA"/>
+        <property ID="0x04" name="Player Model" type="character"/>
+        <property ID="0x05" name="Player Scale" type="vector3f"/>
+        <property ID="0x06" name="Elevator Platform Model" type="file" extensions="CMDL"/>
+        <property ID="0x07" name="Elevator Platform Scale" type="vector3f"/>
+        <property ID="0x08" name="Elevator Background Model" type="file" extensions="CMDL"/>
+        <property ID="0x09" name="Elevator Background Scale" type="vector3f"/>
+        <property ID="0x0A" name="Upward Elevator" type="bool"/>
+        <property ID="0x0B" name="Sound ID" type="long"/>
+        <property ID="0x0C" name="Sound Volume" type="long"/>
+        <property ID="0x0D" name="Unknown (Sound-Related)" type="long"/>
+        <property ID="0x0E" name="Show Text Instead Of Cutscene" type="bool"/>
+        <property ID="0x0F" name="Font" type="file" extensions="FONT"/>
+        <property ID="0x10" name="String" type="file" extensions="STRG"/>
+        <property ID="0x11" name="Fade In From/Out To White" type="bool"/>
+        <property ID="0x12" name="Character Fade In Time" type="float"/>
+        <property ID="0x13" name="Characters Per Second" type="float"/>
+        <property ID="0x14" name="Delay Before Showing Text" type="float"/>
     </properties>
     <states/>
     <messages/>
     <editor>
         <properties>
             <property name="InstanceName" ID="0x00"/>
+            <property name="Active" ID="0x01"/>
         </properties>
         <assets>
             <animparams source="property">0x04</animparams>
diff --git a/templates/mp1/Structs/GrappleParameters.xml b/templates/mp1/Structs/GrappleParameters.xml
index 49deb5a0..e58a4838 100644
--- a/templates/mp1/Structs/GrappleParameters.xml
+++ b/templates/mp1/Structs/GrappleParameters.xml
@@ -12,6 +12,6 @@
         <property ID="0x08" name="Unknown 9" type="float"/>
         <property ID="0x09" name="Unknown 10" type="float"/>
         <property ID="0x0A" name="Unknown 11" type="float"/>
-        <property ID="0x0B" name="Disable turning" type="bool"/>
+        <property ID="0x0B" name="Disable Turning" type="bool"/>
     </properties>
 </struct>
diff --git a/templates/mp2/Script/Pickup.xml b/templates/mp2/Script/Pickup.xml
index 6ffa35c1..53c8f73b 100644
--- a/templates/mp2/Script/Pickup.xml
+++ b/templates/mp2/Script/Pickup.xml
@@ -27,7 +27,7 @@
         <property ID="0xC80FC827" type="float">
             <default>0.0</default>
         </property>
-        <property ID="0x32DC67F6" type="float">
+        <property ID="0x32DC67F6" name="Life Time" type="float">
             <default>0.0</default>
         </property>
         <property ID="0x56E3CEEF" type="float">