diff --git a/Star_Wars_Armada.gst b/Star_Wars_Armada.gst
index e8401c5..d5b8638 100644
--- a/Star_Wars_Armada.gst
+++ b/Star_Wars_Armada.gst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="4007-48b0-a016-7a8e" name="Star_Wars_Armada" revision="35" battleScribeVersion="2.03" authorName="vadersson - initial work by Brian Black - Updates by BlueSeven" authorContact="vadersson or vadersson109 on reddit, BGG, FFG, etc. Brian_Black on BGG or FFG forums   BlueSeven on BSData discord" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
+<gameSystem id="4007-48b0-a016-7a8e" name="Star_Wars_Armada" revision="36" battleScribeVersion="2.03" authorName="vadersson - initial work by Brian Black - Updates by BlueSeven" authorContact="vadersson or vadersson109 on reddit, BGG, FFG, etc. Brian_Black on BGG or FFG forums   BlueSeven on BSData discord" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
   <comment>Added remaining Clone Wars Wave 2 data
 Added Rapid Reinforcements 1
 Added speed charts
@@ -321,19 +321,6 @@ If you are opening a roster from a previous version for the first time you will
         <categoryLink id="1b44-1532-e7c9-9663-9ef5-a2c4-bc40-18b7" name="Raider Corvette" hidden="false" targetId="9ef5-a2c4-bc40-18b7" primary="false"/>
         <categoryLink id="f859-78b9-5fe3-82d6" name="Super Star Destroyer" hidden="false" targetId="78bb-d906-bb13-b3b3" primary="false"/>
         <categoryLink id="1b44-1532-e7c9-9663-7fb1-7ee5-3690-d880" name="Victory-class Star Destroyer" hidden="false" targetId="7fb1-7ee5-3690-d880" primary="false"/>
-        <categoryLink id="1b44-1532-e7c9-9663-f0dc-ae6a-6219-19ef" name="Squadrons" hidden="false" targetId="f0dc-ae6a-6219-19ef" primary="false">
-          <modifiers>
-            <modifier type="increment" field="maxPoints" value="1.0">
-              <repeats>
-                <repeat field="limit::points" scope="roster" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" repeats="1" roundUp="true"/>
-              </repeats>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="points" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="maxPoints" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="1b44-1532-e7c9-9663-c9d8-3a89-4028-05d0" name="Objectives" hidden="false" targetId="c9d8-3a89-4028-05d0" primary="false"/>
         <categoryLink id="702b-dc27-4804-7cef" name="Flotilla" hidden="false" targetId="85e7-c532-9071-4160" primary="false"/>
         <categoryLink id="e4fe-5eec-e2cc-7e21" name="Acclamator-class Assault Ship" hidden="false" targetId="8c65-1e25-1a94-a65f" primary="false"/>
         <categoryLink id="b096-2fdf-44fa-ef0f" name="Arquitens-class Cruiser" hidden="false" targetId="0b6b-2d9b-bdb2-4ba8" primary="false"/>
@@ -345,6 +332,19 @@ If you are opening a roster from a previous version for the first time you will
         <categoryLink id="9f08-60d3-fa45-61db" name="Providence-class Dreadnaught Carrier" hidden="false" targetId="a1ce-1cc4-a94f-5cbe" primary="false"/>
         <categoryLink id="7891-7e38-0893-25ed" name="Pelta-class Frigate" hidden="false" targetId="d53e-d6ae-cd55-7265" primary="false"/>
         <categoryLink id="4ac5-a5ea-7fa9-5d82" name="Armed Station" hidden="false" targetId="3d39-29d1-22ef-34de" primary="false"/>
+        <categoryLink id="35cc-6c5d-201f-0392" name="Squadrons" hidden="false" targetId="f0dc-ae6a-6219-19ef" primary="false">
+          <modifiers>
+            <modifier type="increment" field="3cfd-9a78-0a6f-d625" value="1.0">
+              <repeats>
+                <repeat field="limit::points" scope="roster" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" repeats="1" roundUp="true"/>
+              </repeats>
+            </modifier>
+          </modifiers>
+          <constraints>
+            <constraint field="points" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="3cfd-9a78-0a6f-d625" type="max"/>
+          </constraints>
+        </categoryLink>
+        <categoryLink id="c5bf-dee1-7e98-d424" name="Objectives" hidden="false" targetId="c9d8-3a89-4028-05d0" primary="false"/>
       </categoryLinks>
     </forceEntry>
     <forceEntry id="d57e-9908-0acf-1ebf" name="Tournament" hidden="false">
@@ -370,7 +370,6 @@ If you are opening a roster from a previous version for the first time you will
         <categoryLink id="dbc1-187e-1388-5c4e" name="Modified Pelta-class Ship" hidden="false" targetId="9810-b289-b172-52b4" primary="false"/>
         <categoryLink id="f3fd-81a2-dc13-7bdb" name="Munificent-class Frigate" hidden="false" targetId="748a-3a7d-d223-580f" primary="false"/>
         <categoryLink id="415a-9434-6c5c-9dff" name="Nebulon-B Frigate" hidden="false" targetId="e589-c88e-f2d0-7413" primary="false"/>
-        <categoryLink id="b779-2c89-49f0-cbaf" name="Objectives" hidden="false" targetId="c9d8-3a89-4028-05d0" primary="false"/>
         <categoryLink id="cfa1-5bc5-e47f-9fdf" name="Onager-class Star Destroyer" hidden="false" targetId="e093-475a-5469-0b76" primary="false"/>
         <categoryLink id="7e9e-1145-b920-f308" name="Pelta-class Frigate" hidden="false" targetId="d53e-d6ae-cd55-7265" primary="false"/>
         <categoryLink id="90ca-1ab5-b513-0e2a" name="Providence-class Dreadnaught Carrier" hidden="false" targetId="a1ce-1cc4-a94f-5cbe" primary="false"/>
@@ -382,18 +381,19 @@ If you are opening a roster from a previous version for the first time you will
         <categoryLink id="e1bb-3e9c-97f2-4335" name="Unarmed Station" hidden="false" targetId="8322-2087-0da5-10c1" primary="false"/>
         <categoryLink id="9252-5991-3951-cad0" name="Venator-class Star Destroyer" hidden="false" targetId="8988-a3d2-ecc4-c0e4" primary="false"/>
         <categoryLink id="c6a2-a59e-a19c-c584" name="Victory-class Star Destroyer" hidden="false" targetId="7fb1-7ee5-3690-d880" primary="false"/>
-        <categoryLink id="c9fa-bd2a-5e2d-e341" name="Squadrons" hidden="false" targetId="f0dc-ae6a-6219-19ef" primary="false">
+        <categoryLink id="1991-7ece-994a-4e55" name="Squadrons" hidden="false" targetId="f0dc-ae6a-6219-19ef" primary="false">
           <modifiers>
-            <modifier type="increment" field="maxPoints" value="1.0">
+            <modifier type="increment" field="5b2b-3c5d-9956-22f6" value="1.0">
               <repeats>
                 <repeat field="limit::points" scope="roster" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" repeats="1" roundUp="true"/>
               </repeats>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="points" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="maxPoints" type="max"/>
+            <constraint field="points" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="5b2b-3c5d-9956-22f6" type="max"/>
           </constraints>
         </categoryLink>
+        <categoryLink id="46f6-5d24-0540-ea56" name="Objectives" hidden="false" targetId="c9d8-3a89-4028-05d0" primary="false"/>
       </categoryLinks>
     </forceEntry>
   </forceEntries>