diff --git a/templates/mp1/Enums/WeaponType.xml b/templates/mp1/Enums/WeaponType.xml
index 421be247..8e59e2ce 100644
--- a/templates/mp1/Enums/WeaponType.xml
+++ b/templates/mp1/Enums/WeaponType.xml
@@ -10,11 +10,11 @@
         <enumerator ID="0x06" name="Missile"/>
         <enumerator ID="0x07" name="Boost Ball"/>
         <enumerator ID="0x08" name="Phazon"/>
-        <enumerator ID="0x09" name="Enemy Weapon 1"/>
-        <enumerator ID="0x0A" name="Enemy Weapon 2 (Poison)"/>
-        <enumerator ID="0x0B" name="Enemy Weapon 3 (Lava)"/>
-        <enumerator ID="0x0C" name="Enemy Weapon 4"/>
-        <enumerator ID="0x0D" name="Unknown Weapon 1"/>
-        <enumerator ID="0x0E" name="Unknown Weapon 2"/>
+        <enumerator ID="0x09" name="AI"/>
+        <enumerator ID="0x0A" name="Poison Water"/>
+        <enumerator ID="0x0B" name="Lava"/>
+        <enumerator ID="0x0C" name="Hot"/>
+        <enumerator ID="0x0D" name="Unused Weapon 1"/>
+        <enumerator ID="0x0E" name="Unused Weapon 2"/>
     </enumerators>
 </enum>
diff --git a/templates/mp1/Script/SpecialFunction.xml b/templates/mp1/Script/SpecialFunction.xml
index 49eac64e..ef153e6d 100644
--- a/templates/mp1/Script/SpecialFunction.xml
+++ b/templates/mp1/Script/SpecialFunction.xml
@@ -53,8 +53,8 @@
             </properties>
         </struct>
         <enum ID="0x09" name="Inventory Slot" template="Enums/InventorySlot.xml"/>
-        <property ID="0x0A" name="Unknown 5" type="bool"/>
-        <property ID="0x0B" name="Unknown 6" type="float"/>
+        <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"/>
         <property ID="0x0D" name="Used by SpinnerController 2" type="long"/>
         <property ID="0x0E" name="Used by SpinnerController 3" type="long"/>
@@ -66,6 +66,7 @@
             <property name="InstanceName" ID="0x00"/>
             <property name="Position" ID="0x01"/>
             <property name="Rotation" ID="0x02"/>
+            <property name="Active" ID="0x0A"/>
         </properties>
         <assets>
             <billboard source="file">script/common/SpecialFunction.txtr</billboard>
diff --git a/templates/mp1/Script/WorldLightFader.xml b/templates/mp1/Script/WorldLightFader.xml
index fe011ce5..916d6bc9 100644
--- a/templates/mp1/Script/WorldLightFader.xml
+++ b/templates/mp1/Script/WorldLightFader.xml
@@ -5,7 +5,7 @@
         <property ID="0x00" name="Name" type="string"/>
         <property ID="0x01" name="Active" type="bool"/>
         <property ID="0x02" name="Faded Light Level" type="float"/>
-        <property ID="0x03" name="Initial Light Level" type="float"/>
+        <property ID="0x03" name="Fade Speed" type="float"/>
     </properties>
     <states/>
     <messages/>
diff --git a/templates/mp1/Structs/DamageVulnerability.xml b/templates/mp1/Structs/DamageVulnerability.xml
index b9579252..e2a5f547 100644
--- a/templates/mp1/Structs/DamageVulnerability.xml
+++ b/templates/mp1/Structs/DamageVulnerability.xml
@@ -10,13 +10,13 @@
         <enum ID="0x06" name="Missile" template="Enums/VulnerabilityType.xml"/>
         <enum ID="0x07" name="Boost Ball" template="Enums/VulnerabilityType.xml"/>
         <enum ID="0x08" name="Phazon" template="Enums/VulnerabilityType.xml"/>
-        <enum ID="0x09" name="Enemy Weapon 1" template="Enums/VulnerabilityType.xml"/>
-        <enum ID="0x0A" name="Enemy Weapon 2 (Poison)" template="Enums/VulnerabilityType.xml"/>
-        <enum ID="0x0B" name="Enemy Weapon 3 (Lava)" template="Enums/VulnerabilityType.xml"/>
-        <enum ID="0x0C" name="Enemy Weapon 4" template="Enums/VulnerabilityType.xml"/>
-        <enum ID="0x0D" name="Unknown Weapon 1" template="Enums/VulnerabilityType.xml"/>
-        <enum ID="0x0E" name="Unknown Weapon 2" template="Enums/VulnerabilityType.xml"/>
-        <enum ID="0x0F" name="Unknown Weapon 3" template="Enums/VulnerabilityType.xml"/>
+        <enum ID="0x09" name="AI" template="Enums/VulnerabilityType.xml"/>
+        <enum ID="0x0A" name="Poison Water" template="Enums/VulnerabilityType.xml"/>
+        <enum ID="0x0B" name="Lava" template="Enums/VulnerabilityType.xml"/>
+        <enum ID="0x0C" name="Hot" template="Enums/VulnerabilityType.xml"/>
+        <enum ID="0x0D" name="Unused Weapon 1" template="Enums/VulnerabilityType.xml"/>
+        <enum ID="0x0E" name="Unused Weapon 2" template="Enums/VulnerabilityType.xml"/>
+        <enum ID="0x0F" name="Unused Weapon 3" template="Enums/VulnerabilityType.xml"/>
         <struct ID="0x10" name="ChargedBeams" type="multi">
             <properties>
                 <enum ID="0x00" name="Power" template="Enums/VulnerabilityType.xml"/>
diff --git a/templates/mp1/Structs/VisorParameters.xml b/templates/mp1/Structs/VisorParameters.xml
index f7fb069c..430b03ac 100644
--- a/templates/mp1/Structs/VisorParameters.xml
+++ b/templates/mp1/Structs/VisorParameters.xml
@@ -3,6 +3,13 @@
     <properties>
         <property ID="0x00" name="Unknown 1" type="bool"/>
         <property ID="0x01" name="Unknown 2" type="bool"/>
-        <property ID="0x02" name="Unknown 3" type="long"/>
+        <bitfield ID="0x02" name="Visor Flags">
+            <flags>
+                <flag mask="0x00000001" name="Combat"/>
+                <flag mask="0x00000002" name="Scan"/>
+                <flag mask="0x00000004" name="Thermal"/>
+                <flag mask="0x00000008" name="X-Ray"/>
+            </flags>
+        </bitfield>
     </properties>
 </struct>
diff --git a/templates/mp3/Script/KorbaSnatcherSwarm.xml b/templates/mp3/Script/KorbaSnatcherSwarm.xml
index 2468c866..79dde83f 100644
--- a/templates/mp3/Script/KorbaSnatcherSwarm.xml
+++ b/templates/mp3/Script/KorbaSnatcherSwarm.xml
@@ -73,6 +73,7 @@
             <model source="property">0x7E397FED:0xBB52F0BE</model>
         </assets>
         <rotation_type>enabled</rotation_type>
-        <scale_type>enabled</scale_type>
+        <scale_type>volume</scale_type>
+        <preview_volume shape="Box"/>
     </editor>
 </ScriptTemplate>
diff --git a/templates/mp3/Script/Swarm.xml b/templates/mp3/Script/Swarm.xml
index 94ae085b..e847cdb0 100644
--- a/templates/mp3/Script/Swarm.xml
+++ b/templates/mp3/Script/Swarm.xml
@@ -28,6 +28,7 @@
             <model source="property">0x7E397FED:0xBB52F0BE</model>
         </assets>
         <rotation_type>enabled</rotation_type>
-        <scale_type>enabled</scale_type>
+        <scale_type>volume</scale_type>
+        <preview_volume shape="Box"/>
     </editor>
 </ScriptTemplate>
diff --git a/templates/mp3/Structs/DamageInfo.xml b/templates/mp3/Structs/DamageInfo.xml
index edd425b4..20240b64 100644
--- a/templates/mp3/Structs/DamageInfo.xml
+++ b/templates/mp3/Structs/DamageInfo.xml
@@ -4,17 +4,17 @@
         <enum ID="0x445E00C8">
             <default>0xBC709037</default>
             <enumerators>
-                <enumerator ID="0x8FB41846" name="Unknown 1"/>
-                <enumerator ID="0x42A6A2BC" name="Unknown 2"/>
-                <enumerator ID="0x7F366C5A" name="Unknown 3"/>
-                <enumerator ID="0x1A7E40E0" name="Unknown 4"/>
-                <enumerator ID="0x010EB21C" name="Unknown 5"/>
-                <enumerator ID="0x9B37D58B" name="Unknown 6"/>
-                <enumerator ID="0xBC709037" name="Unknown 7"/>
-                <enumerator ID="0xCD26D8F0" name="Unknown 8"/>
-                <enumerator ID="0x4A2039D3" name="Unknown 9"/>
-                <enumerator ID="0xF8009F03" name="Unknown 10"/>
-                <enumerator ID="0xE7194EEA" name="Unknown 11"/>
+                <enumerator ID="0x8FB41846" name="Power"/>
+                <enumerator ID="0x42A6A2BC" name="Plasma"/>
+                <enumerator ID="0x7F366C5A" name="Nova"/>
+                <enumerator ID="0x1A7E40E0" name="Phazon"/>
+                <enumerator ID="0x010EB21C" name="Missile"/>
+                <enumerator ID="0x9B37D58B" name="Screw Attack"/>
+                <enumerator ID="0xBC709037" name="AI"/>
+                <enumerator ID="0xCD26D8F0" name="Friendly"/>
+                <enumerator ID="0x4A2039D3" name="UnknownSource"/>
+                <enumerator ID="0xF8009F03" name="Electric"/>
+                <enumerator ID="0xE7194EEA" name="Poison Water"/>
             </enumerators>
         </enum>
         <property ID="0xF2D02613" type="float">