diff --git a/Galactic Republic.cat b/Galactic Republic.cat
index 20a0216..790e6b1 100644
--- a/Galactic Republic.cat	
+++ b/Galactic Republic.cat	
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="aa80-2c3e-6e78-52b4" name="Galactic Republic" revision="8" battleScribeVersion="2.03" authorName="vadersson with updates by BlueSeven" authorContact="vadersson or vadersson109 most places online BlueSeven on BSData discord" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="36" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Added Venator titles
-Completed Pelta (both types)
-Added Rapid Reinforcements 1
-Added speed charts
-Added validation target for unique squadrons with defense tokens</comment>
-  <readme>Added Venator titles
-Completed Pelta (both types)
-Added Rapid Reinforcements 1
-Added speed charts
-Added validation target for unique squadrons with defense tokens</readme>
+<catalogue id="aa80-2c3e-6e78-52b4" name="Galactic Republic" revision="9" battleScribeVersion="2.03" authorName="vadersson with updates by BlueSeven" authorContact="vadersson or vadersson109 most places online BlueSeven on BSData discord" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="37" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>Reworked validation of aces and flotillas.
+Added validation targets related to the Summa scenario.</comment>
+  <readme>Reworked validation of aces and flotillas.
+Added validation targets related to the Summa scenario.</readme>
   <selectionEntries>
     <selectionEntry id="e5f4-441f-affd-1db8" name="Delta-7 Aethersprite" hidden="false" collective="false" import="true" type="unit">
       <constraints>
@@ -43,6 +37,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="f943-d4c1-ed0d-a608" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="9056-a4f2-61af-919e" name="Dodge X" hidden="false" targetId="ebc4-b132-7dc6-5337" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="48fd-f102-c56b-d26a" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="17.0"/>
               </costs>
@@ -81,9 +78,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="106f-fc09-ade8-40b5" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="f50f-5db7-66b3-c2ba" name="Grit" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="39d0-b957-22c3-da31" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="6a40-5361-b2a9-5447" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="ec44-083f-ef28-1f49" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="8502-89b2-bb70-75f1" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="23.0"/>
               </costs>
@@ -111,9 +110,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="7b09-f5b3-9cc8-7c34" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="27de-c0eb-f9b7-6d67" name="Intel" hidden="false" targetId="f379-5e57-6d92-edb9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="48cb-4f22-56f2-2e73" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="7e87-494b-2cff-d094" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="39f6-72b3-da4d-49c2" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="cb3c-3e57-9e0b-2ae4" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="26.0"/>
               </costs>
@@ -151,9 +152,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="f63f-f3d8-edc1-968d" name="Adept X" hidden="false" targetId="6915-37a9-4dfd-3263" type="rule"/>
                 <infoLink id="cc25-2619-307f-0578" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="2898-bf42-5d14-1450" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="bc23-a05f-525d-cada" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="a36e-9ea3-5e3d-3932" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="14c5-8a94-defc-00d2" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="23.0"/>
               </costs>
@@ -191,9 +194,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="99fd-919f-7e17-1c28" name="Adept X" hidden="false" targetId="6915-37a9-4dfd-3263" type="rule"/>
                 <infoLink id="ad86-0a88-d391-a562" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="cd38-e697-efb0-8f6b" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="4003-d2b0-cbfb-cc2a" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="26b5-6a20-c465-0285" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="38dc-a880-ef86-7ce8" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="24.0"/>
               </costs>
@@ -232,9 +237,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="3220-9221-6f24-c865" name="Dodge X" hidden="false" targetId="ebc4-b132-7dc6-5337" type="rule"/>
                 <infoLink id="14be-45bf-6241-c827" name="Adept X" hidden="false" targetId="6915-37a9-4dfd-3263" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="9dd2-8991-4a55-1ac6" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="c74f-14fd-f45e-05a5" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="13e2-8d75-70bf-979a" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="f581-af7c-8151-f5a3" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="24.0"/>
               </costs>
@@ -467,6 +474,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="d4c6-d13b-0d5c-4b85" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="dc38-ddd5-a51e-d2a2" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="5c70-a9c7-4dbc-bfff" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -493,9 +503,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="84e5-0a09-b03d-800a" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="4215-379e-9464-c502" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="7df7-9584-3ceb-7c76" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="ad71-cf28-67df-e6d5" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="5757-0ac9-f1b2-a92e" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="6e8b-c0be-4230-8e39" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="23.0"/>
               </costs>
@@ -538,6 +550,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="661a-b253-1656-dbd0" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="89e2-a3c1-b9c7-6dd8" name="Heavy" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="9d42-2936-2dad-7fbd" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="10.0"/>
               </costs>
@@ -576,9 +591,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="d63e-0a05-7796-7559" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="8965-1a6d-ed58-5242" name="Heavy" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="a184-5b15-e00e-5129" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="7f08-2eb5-7723-4328" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+                <categoryLink id="ec40-2f40-e597-68c5" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="523b-0dc5-eb44-f9fb" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="19.0"/>
               </costs>
@@ -621,6 +638,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="1da1-246e-0d15-1a69" name="Escort" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
                 <infoLink id="496d-8f31-45cc-f90a" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="d51d-8699-6765-f977" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
               </costs>
@@ -647,9 +667,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="def3-2868-701d-1c85" name="Escort" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
                 <infoLink id="e3da-ac88-951b-ee01" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="1baf-c3a7-a62a-100f" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="06f0-f609-ea37-c078" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="ec3b-064c-ab6b-611e" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="c67a-b62c-d10d-221a" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="17.0"/>
               </costs>
@@ -676,9 +698,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="9398-17c6-7bc6-5ab0" name="Escort" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
                 <infoLink id="ea16-69dd-177a-164f" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="dd9f-9f52-5bb3-1c25" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="e9a4-30e6-e46d-5757" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="20e9-4f00-c20a-d1b5" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+                <categoryLink id="bd48-36a0-1beb-2c5c" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -1333,14 +1357,26 @@ Added validation target for unique squadrons with defense tokens</readme>
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
-            <conditionGroup type="and">
+            <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="atLeast"/>
-                <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="equalTo"/>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
               </conditions>
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="atLeast"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="set" field="minInRoster" value="0.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
diff --git a/Imperial Navy.cat b/Imperial Navy.cat
index 773f50b..35e9f5b 100644
--- a/Imperial Navy.cat	
+++ b/Imperial Navy.cat	
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="0edc-79db-18a8-7153" name="Imperial Navy" revision="50" battleScribeVersion="2.03" authorName="Brian Black with updates by vadersson, BlueSeven" authorContact="Brian_Black on BGG and FFG Forums vadersson most places. BlueSeven on BSData discord." library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="36" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Added Rapid Reinforcements 1
-Added speed chards
-Added validation target for unique squadrons with defense tokens</comment>
-  <readme>Added Rapid Reinforcements 1
-Added speed charts
-Added validation target for unique squadrons with defense tokens</readme>
+<catalogue id="0edc-79db-18a8-7153" name="Imperial Navy" revision="51" battleScribeVersion="2.03" authorName="Brian Black with updates by vadersson, BlueSeven" authorContact="Brian_Black on BGG and FFG Forums vadersson most places. BlueSeven on BSData discord." library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="37" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>Reworked validation of aces and flotillas.
+Added validation targets related to the Summa scenario.
+Added Special Battery field to profile for Onager class ships.</comment>
+  <readme>Reworked validation of aces and flotillas.
+Added validation targets related to the Summa scenario.
+Added Special Battery field to profile for Onager class ships.</readme>
   <selectionEntries>
     <selectionEntry id="e5f4-441f-affd-1db8" name="Aggressor Assault Fighter" hidden="false" collective="false" import="true" type="unit">
       <constraints>
@@ -38,6 +38,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="6e0e-35d9-f785-b8f9" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="f943-d4c1-ed0d-a608" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="93b7-4903-94be-9d09" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -64,9 +67,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="11a9-1632-857c-fc61" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="0dfa-3a74-b19e-07d4" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="351f-38cf-e07c-da57" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="879d-57d3-7470-0eca" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="700b-3884-8ea7-a8c4" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="3b28-0e12-4b19-cc89" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="21.0"/>
               </costs>
@@ -93,9 +98,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="107e-5892-5c65-d383" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="bb63-9916-5c39-c940" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="f05e-b8db-d3a3-2ea1" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="89e6-6277-065a-3bef" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="7c1e-c034-724b-d6c9" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+                <categoryLink id="0643-e095-8c46-915f" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="21.0"/>
               </costs>
@@ -138,6 +145,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="706a-53a7-8f8a-2f3a" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="ac91-fcd5-0545-57bf" name="New InfoLink" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="cc68-decc-8371-3c21" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="18.0"/>
               </costs>
@@ -180,9 +190,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="46b7-d82a-f2f7-1054" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="58d2-f560-16cf-1c09" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="e446-bd2e-98d4-07fa" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="5429-cf0b-fec1-10c7" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="52b6-5719-8ea6-824d" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+                <categoryLink id="b22c-c1b1-ae0a-f239" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="26.0"/>
               </costs>
@@ -229,9 +241,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="b8c7-f5b3-5c94-903f" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
                 <infoLink id="d3ff-5a82-91a7-3e80" name="Grit" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="cb99-6f22-508d-b16c" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="49f0-779e-6f1b-2a04" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="24.0"/>
               </costs>
@@ -516,7 +528,6 @@ Added validation target for unique squadrons with defense tokens</readme>
             </modifier>
           </modifiers>
         </entryLink>
-        <entryLink id="fe7e-e95a-3522-f24b" name="Flotilla" hidden="false" collective="false" import="true" targetId="8035-580d-5d85-dc3b" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="28.0"/>
@@ -611,7 +622,6 @@ Added validation target for unique squadrons with defense tokens</readme>
             </modifier>
           </modifiers>
         </entryLink>
-        <entryLink id="263b-d985-d518-1e6d" name="Flotilla" hidden="false" collective="false" import="true" targetId="8035-580d-5d85-dc3b" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="23.0"/>
@@ -1124,6 +1134,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="a445-7a0b-1eca-71af" name="" hidden="false" targetId="f379-5e57-6d92-edb9" type="rule"/>
                 <infoLink id="4338-77da-60b7-827f" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="be14-a9b3-c965-f516" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
               </costs>
@@ -1150,9 +1163,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="dd49-fc1e-d28a-b4aa" name="" hidden="false" targetId="f379-5e57-6d92-edb9" type="rule"/>
                 <infoLink id="cb1a-e29d-6e66-015b" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="dd74-a82f-476e-701e" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="bfa0-2882-6310-3c49" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="20.0"/>
               </costs>
@@ -1179,9 +1192,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="8d5d-9366-b24e-06c3" name="Grit" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="3b5c-0665-221f-777a" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="1e93-2bbf-9f73-aa1f" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="6575-42e7-1f98-dff5" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="17.0"/>
               </costs>
@@ -1423,6 +1436,9 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="65f1-e097-329b-9e5f" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="f18f-ad78-da89-b241" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
               </costs>
@@ -1449,6 +1465,10 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="5024-26b7-6ca1-a18b" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="7404-c516-6d13-b112" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="624f-8df1-4879-04f4" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="ab9a-e39b-b683-3363" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="13.0"/>
               </costs>
@@ -1488,9 +1508,11 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="4d6c-d6d6-ffff-9d6e" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="b05a-1daa-329e-088d" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="a8a2-be03-2154-83f4" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="a9ce-7414-e07e-ace2" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="7b6c-44f7-ae0b-5019" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="21.0"/>
               </costs>
@@ -1516,9 +1538,11 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="0130-3d8e-c40d-1005" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="e219-ed0e-3b8b-4fb2" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="a541-ac7f-6625-9ac8" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="6eb7-5d62-d27e-aea9" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+                <categoryLink id="388f-afba-71db-1079" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -1561,6 +1585,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="958c-2762-75e6-5819" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="c1de-eaaa-7472-5325" name="New InfoLink" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="47ae-e0c1-4bc8-627b" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="9.0"/>
               </costs>
@@ -1587,6 +1614,10 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="819d-863f-42ac-cb83" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="8933-855c-8744-4490" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="9f85-e0dd-b61a-c9a0" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="e74c-7032-3bf9-0a87" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="10.0"/>
               </costs>
@@ -1614,9 +1645,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="2cc1-3af3-064b-2339" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="d106-175b-4106-da9e" name="" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="1d1f-9892-3e3f-bab4" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="c487-97d6-43a8-8e2c" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="75e9-f723-670f-d6b0" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="d1fc-8ee8-bb1d-d7d9" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -1643,9 +1676,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="e26d-109f-4de1-0099" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="d875-ec8d-6503-bb59" name="" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="f66d-22a3-4c9d-c014" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="0c1c-ff22-ad98-09b1" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="d915-6966-a5e0-a137" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="a487-4982-2738-6ea6" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -1687,6 +1722,9 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="ed26-295f-17b5-2cce" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="684b-9543-a9aa-7515" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="8.0"/>
               </costs>
@@ -1713,6 +1751,10 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="4cba-aa43-b151-3c4e" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="2449-bdfd-d575-7301" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="bfb6-dac2-a5d7-7b72" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="59b8-f1b7-789b-d515" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="9.0"/>
               </costs>
@@ -1738,9 +1780,11 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="4e0a-a271-78cb-3e0f" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="40df-999a-21ad-e099" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="abef-00d1-5ca6-714a" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="6a8c-2204-348a-b439" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="fee6-f77d-9054-054a" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -1766,9 +1810,11 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="8202-ab05-ac42-e4d2" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="3bc8-9372-ad4c-6ee3" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="0449-b1a5-39d6-6ea9" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="7e23-d918-dba8-c065" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="e458-182f-9104-c787" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -1794,9 +1840,11 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="eb2d-85ed-dae8-9823" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="cb5c-c498-32e5-dbbd" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="543c-94e8-7921-cf75" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="2a97-c1bf-c2c8-fdcf" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="1b11-5311-bcb4-94d1" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="13.0"/>
               </costs>
@@ -1839,6 +1887,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="5212-859b-6400-0a5c" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="1314-20b4-6221-b823" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="345a-4eb4-dd47-d3ab" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="11.0"/>
               </costs>
@@ -1865,6 +1916,10 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="6ed1-14ed-f849-08ae" name="" hidden="false" targetId="28b3-3ce6-3f2b-9ca1" type="rule"/>
                 <infoLink id="bb02-8ef1-c168-f3df" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="fac2-15c5-780c-14bb" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="2ec7-f239-bc57-6724" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
               </costs>
@@ -1891,9 +1946,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="dcd5-bd2d-84d2-5178" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="44d1-5b69-35e5-e407" name="New InfoLink" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="91f1-5de3-9b00-a416" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="d157-0a49-c46f-333b" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="f059-6017-e952-22f6" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="26cf-2321-db6a-fcb7" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="17.0"/>
               </costs>
@@ -1920,9 +1977,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="fc82-50e4-f47a-edd5" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="5e1b-62a1-38b6-39f6" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="4f53-919a-522f-3bca" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="ef6c-9efd-0fa3-3576" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="1217-fbef-9dfe-7aab" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="2dd3-67d1-0cb1-eb9a" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="18.0"/>
               </costs>
@@ -2224,6 +2283,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="8b89-0489-23c6-d4e4" name="" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
                 <infoLink id="ed83-92bc-c5e6-93ae" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="c6a3-d514-63ed-ce82" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -2250,9 +2312,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="0420-8810-3cba-96f4" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="4930-1e50-a787-e7d1" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="ff50-3671-c926-ab42" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="ccef-51b5-d666-fc99" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="825b-55c0-f315-980d" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="c09f-d82b-829e-5c91" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="23.0"/>
               </costs>
@@ -2279,9 +2343,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="84c7-df09-50d6-17b3" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="d8c6-5796-cf0a-c122" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="d6c9-e1a7-180f-a82b" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="278b-beff-e738-8aec" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="5f2e-4140-b9bd-eae3" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="afef-2392-083d-562c" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="22.0"/>
               </costs>
@@ -2504,6 +2570,9 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="29ba-1cd4-11d5-3351" name="" hidden="false" targetId="405c-d276-9f64-9ae4" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="0613-9652-0e3b-0bef" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="14.0"/>
               </costs>
@@ -2529,9 +2598,11 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="b565-fe47-2ec2-83d7" name="" hidden="false" targetId="405c-d276-9f64-9ae4" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="578d-0ef5-700c-54ab" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="49f3-0708-25aa-47ce" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="89ff-63e8-4b39-8416" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="f8f5-65f6-9a83-578c" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="20.0"/>
               </costs>
@@ -2573,6 +2644,9 @@ Added validation target for unique squadrons with defense tokens</readme>
               <infoLinks>
                 <infoLink id="5e29-67d3-a46a-b28b" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="6a51-1f9e-ed4e-a51a" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -2599,9 +2673,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="c6e8-af37-4ed6-1f70" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="8f8d-16ed-ecba-b1f8" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="dd73-347b-7fc8-73a2" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="1cba-27c9-4aa4-b257" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="6a1d-1a78-7f1a-59d8" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="024f-31c7-925c-c9c9" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="21.0"/>
               </costs>
@@ -2643,9 +2719,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="da4e-9762-6211-5c1f" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="b829-453c-c1dd-49bf" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="931a-f610-fced-626b" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="b854-8358-b21d-06b6" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="1342-6389-a778-6c6a" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="549d-952e-41fb-b809" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="25.0"/>
               </costs>
@@ -2689,6 +2767,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="6c95-512c-ee4c-9b5d" name="" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
                 <infoLink id="3c9b-a8e0-0f4f-ded2" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="3056-bbb2-9503-594a" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="22.0"/>
               </costs>
@@ -2715,9 +2796,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="3000-06fe-6148-2a20" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="3d4f-bb22-ea1f-de45" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="c243-ba0e-5856-6626" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="41ad-c743-6ced-94e2" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="761f-dc91-5e55-db01" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="6a8a-b2e2-6013-6187" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="27.0"/>
               </costs>
@@ -2761,6 +2844,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="7002-931b-232c-d02a" name="" hidden="false" targetId="2dbc-c5ad-6def-194e" type="rule"/>
                 <infoLink id="fe88-f9aa-38ae-0b03" name="" hidden="false" targetId="d374-f203-8873-7051" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="4c3f-264d-abbd-d46f" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -2787,9 +2873,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="60a0-ca59-0b48-26a7" name="" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
                 <infoLink id="777b-08f4-08ad-262f" name="" hidden="false" targetId="2dbc-c5ad-6def-194e" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="8fab-dc6b-7755-a8c6" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="3979-fd1f-b892-30b5" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="aa92-867a-524f-19ee" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="9db9-e5bb-f1e9-5f6f" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="20.0"/>
               </costs>
@@ -3308,6 +3396,9 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="1840-65b0-45f6-54b1" name="Assault" hidden="false" targetId="0e25-812e-a5fd-7f07" type="rule"/>
                 <infoLink id="da1b-bb09-fa53-78da" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="e213-dde4-810e-9199" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="20.0"/>
               </costs>
@@ -3334,9 +3425,11 @@ Added validation target for unique squadrons with defense tokens</readme>
                 <infoLink id="7268-1bb4-7ff4-6bba" name="Assault" hidden="false" targetId="0e25-812e-a5fd-7f07" type="rule"/>
                 <infoLink id="04f8-bcf9-9a27-9c59" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="2ee5-1bb8-32c3-b67f" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="1f47-2856-2eaf-26c7" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="7858-0681-2b22-f9e3" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="af68-c281-e937-e656" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="23.0"/>
               </costs>
@@ -4145,14 +4238,26 @@ Added validation target for unique squadrons with defense tokens</readme>
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
-            <conditionGroup type="and">
+            <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="atLeast"/>
-                <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="equalTo"/>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
               </conditions>
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="atLeast"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="set" field="minInRoster" value="0.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
diff --git a/Rebel Fleet.cat b/Rebel Fleet.cat
index b5c134d..07b79dc 100644
--- a/Rebel Fleet.cat	
+++ b/Rebel Fleet.cat	
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ebb6-1d9a-63f3-4ef6" name="Rebel Fleet" revision="50" battleScribeVersion="2.03" authorName="Brian Black with updates by vadersson, BlueSeven" authorContact="Brian_Black on BGG and FFG Forums vadersson in lots of places BlueSeven on BSData discord" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="36" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Added Rapid Reinforcements 1
-Added speed charts
-Added validation target for unique squadrons with defense tokens
-Fixed some uniqueness hidden flags</comment>
-  <readme>Added Rapid Reinforcements 1
-Added speed charts
-Added validation target for unique squadrons with defense tokens
-Fixed some uniqueness hidden flags</readme>
+<catalogue id="ebb6-1d9a-63f3-4ef6" name="Rebel Fleet" revision="51" battleScribeVersion="2.03" authorName="Brian Black with updates by vadersson, BlueSeven" authorContact="Brian_Black on BGG and FFG Forums vadersson in lots of places BlueSeven on BSData discord" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="37" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>Reworked validation of aces and flotillas.
+Added validation targets related to the Summa scenario.</comment>
+  <readme>Reworked validation of aces and flotillas.
+Added validation targets related to the Summa scenario.</readme>
   <selectionEntries>
     <selectionEntry id="7234-a2c9-5ef1-5b36" name="A-Wing" hidden="false" collective="false" import="true" type="unit">
       <constraints>
@@ -39,6 +35,9 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="0606-5208-54fa-aa6c" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="f5a4-a480-6bcd-eeb6" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="11.0"/>
               </costs>
@@ -65,6 +64,10 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="e690-3432-0f2c-d0f7" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="3b2f-ef93-a608-7897" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="db48-7ced-03b0-4158" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="9e72-c68b-d4e8-9e6b" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
               </costs>
@@ -90,9 +93,11 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="c184-203b-3260-f6a4" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="4266-412e-4723-1dbf" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="4d02-a680-7ae4-0883" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="47fb-2ace-f9fc-673f" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="1391-a66f-a243-fee3" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="17.0"/>
               </costs>
@@ -118,9 +123,11 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="1c31-cf07-92b3-deaf" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="8060-4782-dfe8-5add" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="bb50-8fa0-4e31-b2ac" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="0b9d-10fe-646b-5cc8" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="b8e0-8f4a-ec87-cfe1" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -348,6 +355,9 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="5c42-a90f-7e57-fbed" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="93eb-3bc2-cdfc-0d97" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="14.0"/>
               </costs>
@@ -374,6 +384,10 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="136f-cba1-71d3-436e" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="6ffc-6d89-fbd9-04fe" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="c995-ce26-8745-e164" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="6ce0-9f10-94eb-41cc" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -399,9 +413,11 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="7656-a739-a9a7-daed" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="546e-b55d-5e11-4223" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="65fb-2873-2da5-4b8d" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="6451-5d40-56c4-69c9" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="030f-52f0-5c69-c010" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="20.0"/>
               </costs>
@@ -427,9 +443,11 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="a997-c7ed-3ffc-ed9c" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="9636-ba1e-cbf9-b586" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="03a3-47f8-dda3-dc3f" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="5cd4-cd7e-541f-5cfb" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="b062-a2f3-85df-67e1" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="19.0"/>
               </costs>
@@ -698,7 +716,6 @@ Fixed some uniqueness hidden flags</readme>
         <entryLink id="733d-a8de-45d5-c337" name="Fleet Support" hidden="false" collective="false" import="true" targetId="5fa2-7fc1-d773-740c" type="selectionEntryGroup"/>
         <entryLink id="703a-5443-82b1-ed93" name="Offensive Retrofit" hidden="false" collective="false" import="true" targetId="0a55-2f8b-aff3-154e" type="selectionEntryGroup"/>
         <entryLink id="2548-7ebe-49b0-66b3" hidden="false" collective="false" import="true" targetId="10d5-12af-b773-cd45" type="selectionEntryGroup"/>
-        <entryLink id="db2c-89d5-97e3-cefe" name="Flotilla" hidden="false" collective="false" import="true" targetId="8035-580d-5d85-dc3b" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="24.0"/>
@@ -777,7 +794,6 @@ Fixed some uniqueness hidden flags</readme>
         <entryLink id="1202-a94a-1ac2-27d6" name="Fleet Support" hidden="false" collective="false" import="true" targetId="5fa2-7fc1-d773-740c" type="selectionEntryGroup"/>
         <entryLink id="b58b-e943-8ca1-867c" name="Offensive Retrofit" hidden="false" collective="false" import="true" targetId="0a55-2f8b-aff3-154e" type="selectionEntryGroup"/>
         <entryLink id="d310-a920-0afb-dbb9" hidden="false" collective="false" import="true" targetId="10d5-12af-b773-cd45" type="selectionEntryGroup"/>
-        <entryLink id="fafc-8aff-0a4a-397e" name="Flotilla" hidden="false" collective="false" import="true" targetId="8035-580d-5d85-dc3b" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="18.0"/>
@@ -814,6 +830,9 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="90b8-a991-1eaf-dfd3" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="3e18-1278-faed-89f8" name="" hidden="false" targetId="f379-5e57-6d92-edb9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="4e61-186f-9829-4729" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
               </costs>
@@ -840,9 +859,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="aa9f-fcf4-ac3b-43eb" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="5343-49cb-c25a-f9a0" name="" hidden="false" targetId="f379-5e57-6d92-edb9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="b5c0-5063-02ff-7747" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="3c90-2d28-4a80-3d5c" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="95d9-c0fb-f956-a637" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="44e8-88ee-0a6c-7076" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="19.0"/>
               </costs>
@@ -870,9 +891,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="4c9d-f545-0b1c-9296" name="Cloak" hidden="false" targetId="405c-d276-9f64-9ae4" type="rule"/>
                 <infoLink id="a9bf-f5f7-c779-819e" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="727d-46b6-dcaa-5761" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="b210-24bd-64c3-141e" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="577a-7411-36de-c063" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="d03d-e538-6343-8770" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="19.0"/>
               </costs>
@@ -1540,6 +1563,9 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="aa6a-04fa-f533-de4c" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="6fae-f416-692c-d6ae" name="" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="231d-ac62-6aff-e9a9" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -1566,9 +1592,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="5b56-8b3a-e983-8f15" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="1e42-cb0d-1b50-c091" name="Grit" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="2270-b13c-84a0-cb63" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="ddf5-ab93-f1e2-9a32" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="0307-c489-f0ac-6f11" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="89fd-ce54-5d41-3a4c" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="21.0"/>
               </costs>
@@ -1595,9 +1623,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="d16b-9e97-a510-b447" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="e748-ff64-3bd8-a941" name="Grit" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="27e2-bf02-75dd-458c" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="3978-dc76-50bf-6c34" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="3a78-e148-7ff4-92a5" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="1f58-0fb1-ec62-481a" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="26.0"/>
               </costs>
@@ -1640,6 +1670,9 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="e932-0f42-8b35-ebcb" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="fd8b-17bd-6428-f861" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="b28e-debb-dcfb-2dd4" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="13.0"/>
               </costs>
@@ -1666,6 +1699,10 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="a5b0-aa0c-706a-5fef" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="4555-6680-6a98-fdad" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="7f2f-3805-0972-97f4" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="e42d-6272-2866-5790" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="14.0"/>
               </costs>
@@ -1692,9 +1729,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="da24-dd49-9e3b-7b3f" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="da8b-39d2-7dbd-8c39" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="40e9-5c3d-5b27-2276" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="513d-6998-2b7f-39f1" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="d9fe-5057-da10-a8c6" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="9821-f9e6-7251-8eca" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="19.0"/>
               </costs>
@@ -1721,9 +1760,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="1024-5569-0f32-44d5" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="5d80-de68-f4f8-710d" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="bcff-2d56-ae1b-56f6" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="c062-5e98-95a1-341a" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="3569-de86-4dcc-deb0" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="444e-a82c-500d-a8a7" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="20.0"/>
               </costs>
@@ -1761,9 +1802,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="c0b3-5a91-2277-3c0f" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="12b2-3567-638c-e9f1" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="576e-5081-ddc3-d07f" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="37ee-cdd9-fed6-eaf1" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="531b-2113-63a3-1db0" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="5124-56d2-d6ab-f782" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="19.0"/>
               </costs>
@@ -1802,9 +1845,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="b855-339f-f909-4833" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="c127-9a61-ce1d-1da2" name="Adept X" hidden="false" targetId="6915-37a9-4dfd-3263" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="14be-6dca-6bcc-3900" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="8fd5-b007-edff-5c0c" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="866e-a627-f74c-0177" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="5582-3110-b6f1-b998" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="23.0"/>
               </costs>
@@ -1847,6 +1892,9 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="7d2c-f8ff-b029-5271" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="720f-5c10-f7a0-b25f" name="" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="eef6-da02-6468-a9d4" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="10.0"/>
               </costs>
@@ -1873,9 +1921,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="c1c4-2fbc-b926-ae31" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="dbf3-aaf2-d59c-b190" name="" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="9b34-7f51-ccd6-af59" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="8798-23b7-0dca-ba37" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="95ad-d2ee-7978-2f0b" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="c847-9658-4463-686d" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -1901,6 +1951,10 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="8271-dda2-8917-acc7" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="052a-f184-0966-7a34" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="73e6-0a88-38ce-39d3" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
               </costs>
@@ -1926,9 +1980,11 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="9329-d8a6-c86b-3fa7" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="31f3-3585-f967-e05e" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="85b7-0d6b-8b6b-a39b" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="0d72-126c-4ee7-ff27" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="2820-4a7b-a145-dc1f" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="17.0"/>
               </costs>
@@ -1971,6 +2027,9 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="4296-e73a-0cd3-ba9f" name="" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="4cda-1ffd-b55c-3795" name="" hidden="false" targetId="07d3-db6c-dc52-bd78" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="4f0a-a9b3-1118-58ea" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="13.0"/>
               </costs>
@@ -2013,9 +2072,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="8227-42db-149c-62b9" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="dea2-032e-0651-ba1d" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="f704-83b1-77f3-de0b" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="07dc-c291-cdb6-aa6b" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="3e92-5594-e289-0022" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="a237-6a82-8023-b640" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="26.0"/>
               </costs>
@@ -2061,9 +2122,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="05c2-e59f-4738-6587" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="0c14-1ffd-b47e-20dc" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="6527-756a-d59b-c4ab" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="a2c7-4d72-ecd9-5b2d" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="42c6-1268-02a9-9eb7" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="2488-77b2-fe49-4bfc" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="23.0"/>
               </costs>
@@ -2105,6 +2168,9 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="d457-a9bb-6e6c-2147" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="0e6e-e7ef-2493-f87f" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -2131,9 +2197,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="c27f-454e-2495-4d05" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="94c2-3d10-860b-c49e" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="3654-d6ce-b996-65f4" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="1925-30ea-33fc-8717" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="9d7a-3de8-daa9-6fa4" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="d068-3efe-ccab-af70" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="24.0"/>
               </costs>
@@ -2160,9 +2228,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="a06b-919d-2043-9a0d" name="Grit" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="3e84-19b1-8031-e135" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="365d-ec9f-df33-48e7" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="3e03-5451-8f75-37e6" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="2788-2496-f943-bef6" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="ab56-263f-0b2d-9d13" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="22.0"/>
               </costs>
@@ -2386,6 +2456,9 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="ec5e-2c24-b7f0-539d" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="1845-0751-ca0f-1f53" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="7.0"/>
               </costs>
@@ -2411,9 +2484,11 @@ Fixed some uniqueness hidden flags</readme>
               <infoLinks>
                 <infoLink id="0c55-a3f9-f058-43d9" name="" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="8cd8-2bac-28db-3d6a" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="c813-966b-7b88-ad33" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="4e46-a552-6b50-9aca" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="8247-8924-1ec2-e9b0" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="14.0"/>
               </costs>
@@ -2456,6 +2531,9 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="bd18-a5a2-83a5-b6c3" name="" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="45c3-16b2-8b1a-be40" name="" hidden="false" targetId="28b3-3ce6-3f2b-9ca1" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="59cf-ee58-35fa-e871" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -2483,9 +2561,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="dee8-4337-0004-55f7" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
                 <infoLink id="7efc-2bce-2270-23a9" name="" hidden="false" targetId="28b3-3ce6-3f2b-9ca1" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="798b-c337-d084-bce5" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="540b-eb74-94c3-8e98" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="b401-c39c-e9c3-327c" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="6ec8-5d18-9dc9-1c7e" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="22.0"/>
               </costs>
@@ -2529,6 +2609,9 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="4005-ffee-7f82-5dde" name="" hidden="false" targetId="2dbc-c5ad-6def-194e" type="rule"/>
                 <infoLink id="baf5-a487-005c-b122" name="" hidden="false" targetId="d374-f203-8873-7051" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="b860-8412-dc1a-d310" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -2566,9 +2649,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="1ad4-2ca9-6404-e940" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="0699-c218-433d-21de" name="New InfoLink" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="ad28-f7f9-1ccc-a57b" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="a0b6-d8aa-1e0f-a0d1" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="bd0b-9419-bc7c-1bbb" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="0607-a3e0-8b37-c9e1" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="28.0"/>
               </costs>
@@ -2612,6 +2697,9 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="d7a2-3d40-4aff-52fb" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="83cd-7bf3-7a39-3451" name="" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="d8c2-d888-2991-a751" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -2639,9 +2727,11 @@ Fixed some uniqueness hidden flags</readme>
                 <infoLink id="4563-bcad-e281-16f8" name="" hidden="false" targetId="64f9-c7b3-c2e0-e41a" type="rule"/>
                 <infoLink id="deb5-374d-c270-a62b" name="Rogue" hidden="false" targetId="07dd-35ce-00b5-aedf" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="b358-de3b-de81-7f1b" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="80b3-ee64-334a-0e35" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="a310-9cab-b111-be3b" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="80e7-05fb-7f7a-51aa" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="22.0"/>
               </costs>
@@ -3428,14 +3518,26 @@ Fixed some uniqueness hidden flags</readme>
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
-            <conditionGroup type="and">
+            <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="atLeast"/>
-                <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="equalTo"/>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
               </conditions>
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="equalTo"/>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="atLeast"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="set" field="minInRoster" value="0.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
diff --git a/Separatist Alliance.cat b/Separatist Alliance.cat
index e98950f..e2c1560 100644
--- a/Separatist Alliance.cat	
+++ b/Separatist Alliance.cat	
@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ae1c-e74b-aaa3-ec59" name="Separatist Alliance" revision="7" battleScribeVersion="2.03" authorName="vadersson with updates by BlueSeven" authorContact="vadersson or vadersson109 most places online BlueSeven on BSData discord" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="36" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Added remaining data from Clone wars wave 2
-Added stats and tokens to Recusant LD.
-Added Rapid Reinforcements 1
-Added speed charts
-Added validation targets for unique squadrons with defense tokens</comment>
-  <readme>Added remaining data from Clone wars wave 2
-Added stats and tokens to Recusant LD.
-Added Rapid Reinforcements 1
-Added speed charts
-Added validation targets for unique squadrons with defense tokens</readme>
+<catalogue id="ae1c-e74b-aaa3-ec59" name="Separatist Alliance" revision="8" battleScribeVersion="2.03" authorName="vadersson with updates by BlueSeven" authorContact="vadersson or vadersson109 most places online BlueSeven on BSData discord" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="37" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>Reworked validation of aces and flotillas.
+Added validation targets related to the Summa scenario.</comment>
+  <readme>Reworked validation of aces and flotillas.
+Added validation targets related to the Summa scenario.</readme>
   <selectionEntries>
     <selectionEntry id="e5f4-441f-affd-1db8" name="Droid Tri-Fighter" hidden="false" collective="false" import="true" type="unit">
       <constraints>
@@ -43,6 +37,9 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="f943-d4c1-ed0d-a608" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="9056-a4f2-61af-919e" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="982e-3859-8ee3-3c3c" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="11.0"/>
               </costs>
@@ -70,9 +67,11 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="9d18-cb79-6111-5a06" name="Counter X" hidden="false" targetId="7022-8686-4ec8-eb64" type="rule"/>
                 <infoLink id="7096-3af4-c6c0-2506" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="006c-e141-e7e1-042b" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="4956-78b5-783e-61c8" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="0ca6-fee2-a853-4e4b" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="8680-8297-777a-1616" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="19.0"/>
               </costs>
@@ -101,9 +100,11 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="e536-6c07-a43a-a6a7" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
                 <infoLink id="3d5f-1ec1-0d00-b538" name="Snipe X" hidden="false" targetId="28b3-3ce6-3f2b-9ca1" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="1a31-bcf4-a60b-3b39" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="544d-0117-dc0a-df6a" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="633d-2d56-d8ad-f03a" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="cc07-c30c-220b-67a3" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="17.0"/>
               </costs>
@@ -332,6 +333,9 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="d4c6-d13b-0d5c-4b85" name="Relay X" hidden="false" targetId="2dbc-c5ad-6def-194e" type="rule"/>
                 <infoLink id="dc38-ddd5-a51e-d2a2" name="Screen" hidden="false" targetId="f2a7-fd2f-6141-c125" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="7db6-7956-d20a-6754" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="15.0"/>
               </costs>
@@ -369,9 +373,11 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="84e5-0a09-b03d-800a" name="Relay X" hidden="false" targetId="2dbc-c5ad-6def-194e" type="rule"/>
                 <infoLink id="4215-379e-9464-c502" name="Screen" hidden="false" targetId="f2a7-fd2f-6141-c125" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="59e3-a187-287b-ffc6" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="458c-c4e3-30d6-bb3d" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="0053-59c2-62d7-88a6" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="e01b-2474-d731-914b" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="22.0"/>
               </costs>
@@ -415,6 +421,9 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="89e2-a3c1-b9c7-6dd8" name="Heavy" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
                 <infoLink id="0ecf-c19d-ef3c-eedc" name="AI: Battery X" hidden="false" targetId="14b3-73fa-ba00-b318" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="d6c6-e525-b98f-f6be" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="11.0"/>
               </costs>
@@ -442,9 +451,11 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="d63e-0a05-7796-7559" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="8965-1a6d-ed58-5242" name="Heavy" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="562e-f526-cd52-3e2e" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="a484-6c72-6f79-23da" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="dbde-4056-28ae-97af" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+                <categoryLink id="eb29-e3a2-8fc8-ecd4" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="17.0"/>
               </costs>
@@ -472,9 +483,11 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="258d-6824-ca70-0ebf" name="Bomber" hidden="false" targetId="1d2a-cdbb-2b66-ce85" type="rule"/>
                 <infoLink id="6f0c-5ba8-f5ef-0d03" name="Heavy" hidden="false" targetId="deb6-270e-150f-06d5" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="4daf-9ab3-b44a-a794" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="771a-b3f5-a95b-f6c1" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="b85d-c4b7-af40-45af" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="3f1a-f020-ea0a-587d" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -517,6 +530,9 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="1da1-246e-0d15-1a69" name="AI:  Anti-Squadron X" hidden="false" targetId="7f1d-e149-5445-61f4" type="rule"/>
                 <infoLink id="496d-8f31-45cc-f90a" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
+              <categoryLinks>
+                <categoryLink id="c66d-88be-2f88-c9a5" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="8.0"/>
               </costs>
@@ -544,9 +560,11 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="e3da-ac88-951b-ee01" name="Intel" hidden="false" targetId="f379-5e57-6d92-edb9" type="rule"/>
                 <infoLink id="36fc-516c-4357-0559" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="9227-ff13-bafd-ae67" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="edfa-a77a-83ca-924f" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="655c-09b3-dd3e-58b5" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="da99-31f4-1e76-4169" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="18.0"/>
               </costs>
@@ -573,9 +591,11 @@ Added validation targets for unique squadrons with defense tokens</readme>
                 <infoLink id="9398-17c6-7bc6-5ab0" name="AI:  Anti-Squadron X" hidden="false" targetId="7f1d-e149-5445-61f4" type="rule"/>
                 <infoLink id="ea16-69dd-177a-164f" name="Swarm" hidden="false" targetId="0172-dd4d-907c-a8a9" type="rule"/>
               </infoLinks>
-              <entryLinks>
-                <entryLink id="ac2c-e9bb-76d5-e379" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" targetId="bb91-2395-c338-55b1" type="selectionEntry"/>
-              </entryLinks>
+              <categoryLinks>
+                <categoryLink id="08fe-38ad-90ce-ee13" name="Squadron" hidden="false" targetId="1033-4475-51fe-2d49" primary="false"/>
+                <categoryLink id="56ac-8f85-1335-14af" name="Unique Squadrons" hidden="false" targetId="b480-bb94-e584-7963" primary="false"/>
+                <categoryLink id="c390-8222-8743-5352" name="Unique Squadron With Defense tokens" hidden="false" targetId="5e3d-2b80-d3a8-dbb8" primary="false"/>
+              </categoryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="16.0"/>
               </costs>
@@ -1191,7 +1211,6 @@ Added validation targets for unique squadrons with defense tokens</readme>
         <entryLink id="5bfa-5d5d-8362-7268" name="Officer" hidden="false" collective="false" import="true" targetId="10d5-12af-b773-cd45" type="selectionEntryGroup"/>
         <entryLink id="8365-9c04-00d4-daa8" name="Ion Cannons" hidden="false" collective="false" import="true" targetId="a176-c60f-7d96-1496" type="selectionEntryGroup"/>
         <entryLink id="de00-67b3-b5ee-87ed" name="Weapons Team" hidden="false" collective="false" import="true" targetId="baa5-7a1e-92ea-a312" type="selectionEntryGroup"/>
-        <entryLink id="e568-6091-8944-4df7" name="Flotilla" hidden="false" collective="false" import="true" targetId="8035-580d-5d85-dc3b" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="27.0"/>
@@ -1203,14 +1222,26 @@ Added validation targets for unique squadrons with defense tokens</readme>
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
-            <conditionGroup type="and">
+            <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="atLeast"/>
-                <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="equalTo"/>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
               </conditions>
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="atLeast"/>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d77d-f98a-9b86-934a" type="equalTo"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="set" field="minInRoster" value="0.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
diff --git a/Star_Wars_Armada.gst b/Star_Wars_Armada.gst
index 50a0620..530a41b 100644
--- a/Star_Wars_Armada.gst
+++ b/Star_Wars_Armada.gst
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<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
-Added validation rule for unique squads with defense tokens at 1 per full 100pts
-Added &quot;Tournament&quot; force type (Validates 2 max flotillas)
-Added remaining campaign objectives</comment>
-  <readme>Added remaining Clone Wars Wave 2 data.
-Added Rapid Reinforcements 1.
-Added speed charts - the speed is across the top of the table due to how profiles work. I used &quot;-&quot; &quot;1&quot; and &quot;2&quot; for numbers of clicks at each joind to keep it to a single character while still looking similar. Let me know if there are formatting issues.
-Added validation rule for unique squads with defense tokens at 1 per full 100pts.
-Added remaining campaign objectives.
-Fixed miscellaneous typos and uniqueness hidden flags.
-Added &quot;Tournament&quot; force type (Validates 2 max flotillas).
-Have not restricted max pts to 400 in the Tournament force type to allow flexibility. Only change from standard at this point is flotillas restricted to max 2.
+<gameSystem id="4007-48b0-a016-7a8e" name="Star_Wars_Armada" revision="37" 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 Summa of all Things scenario force type.
+A field for special battery has been added for the Onager class ships.</comment>
+  <readme>Added Summa of all Things scenario force type validation the following rules:
+Max 1 medium ship
+Max 1 flotilla
+Min 4 squadrons
+Max 2 unique squadrons.
+Large and huge ships, and commanders are not available in line with scenario rules.
+
+A field for special battery has been added for the Onager class ships.
 
 Issues with pre-existing rosters:
-If you are opening a roster from a previous version for the first time you will see a selection box for &quot;Flotilla&quot; or &quot;Unique squadron with defense tokens&quot; under models of those types. You can either tick the box which will cause it to disappear, or remove and re-add the model which will set the flag for these models correctly.</readme>
+I have reworked how Aces and Flotillas are validated to add validation for Summa forces. As such the properties that were previously used are now removed. Pre-existing rosters will show errors on open related to this, but can be then saved again to remove the errors.</readme>
   <costTypes>
     <costType id="points" name="pts" defaultCostLimit="0.0" hidden="false"/>
   </costTypes>
@@ -278,6 +274,15 @@ If you are opening a roster from a previous version for the first time you will
         <characteristicType id="9e98-b167-c4a6-6212" name="Max Speed"/>
       </characteristicTypes>
     </profileType>
+    <profileType id="8947-c5ed-0bcd-acd6" name="8.5 Scenario Objective">
+      <characteristicTypes>
+        <characteristicType id="4fb2-570c-5adb-1499" name="Setup"/>
+        <characteristicType id="86dc-37ee-09a2-6c94" name="Special Rule"/>
+        <characteristicType id="f650-7650-beea-be8d" name="End of Round"/>
+        <characteristicType id="6a53-f6fa-d9c8-9f3a" name="End of Game"/>
+        <characteristicType id="e3f7-99d8-c815-63f2" name="Victory Token Value"/>
+      </characteristicTypes>
+    </profileType>
   </profileTypes>
   <categoryEntries>
     <categoryEntry id="8988-a3d2-ecc4-c0e4" name="Venator-class Star Destroyer" hidden="false"/>
@@ -300,13 +305,42 @@ If you are opening a roster from a previous version for the first time you will
     <categoryEntry id="9ef5-a2c4-bc40-18b7" name="Raider-class Corvette" hidden="false"/>
     <categoryEntry id="78bb-d906-bb13-b3b3" name="Super Star Destroyer" hidden="false"/>
     <categoryEntry id="7fb1-7ee5-3690-d880" name="Victory-class Star Destroyer" hidden="false"/>
-    <categoryEntry id="f0dc-ae6a-6219-19ef" name="Squadrons" hidden="false"/>
+    <categoryEntry id="f0dc-ae6a-6219-19ef" name="Squadrons" hidden="false">
+      <comment>Main squadron category</comment>
+    </categoryEntry>
     <categoryEntry id="c9d8-3a89-4028-05d0" name="Objectives" hidden="false"/>
     <categoryEntry id="7124-ce4d-f2f7-b1fc" name="MC75 Cruiser" hidden="false"/>
     <categoryEntry id="fe1d-3608-d9e7-491e" name="Small Ship" hidden="false"/>
-    <categoryEntry id="034d-5d10-2acd-a23f" name="Medium Ship" hidden="false"/>
+    <categoryEntry id="034d-5d10-2acd-a23f" name="Medium Ship" hidden="false">
+      <modifiers>
+        <modifier type="set" field="8ac9-c55f-9c57-f11a" value="1.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="8ac9-c55f-9c57-f11a" type="max"/>
+      </constraints>
+    </categoryEntry>
     <categoryEntry id="28b9-dee2-dcc6-c2a7" name="Large Ship" hidden="false"/>
-    <categoryEntry id="85e7-c532-9071-4160" name="Flotilla" hidden="false"/>
+    <categoryEntry id="85e7-c532-9071-4160" name="Flotilla" hidden="false">
+      <modifiers>
+        <modifier type="set" field="8919-5f1a-b9a6-890e" value="1.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" field="8919-5f1a-b9a6-890e" value="2.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d57e-9908-0acf-1ebf" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="8919-5f1a-b9a6-890e" type="max"/>
+      </constraints>
+    </categoryEntry>
     <categoryEntry id="6ea5-34d9-23d0-8729" name="Huge Ship" hidden="false"/>
     <categoryEntry id="3d39-29d1-22ef-34de" name="Armed Station" hidden="false"/>
     <categoryEntry id="0b6b-2d9b-bdb2-4ba8" name="Arquitens-class Cruiser" hidden="false"/>
@@ -318,6 +352,43 @@ If you are opening a roster from a previous version for the first time you will
     <categoryEntry id="d53e-d6ae-cd55-7265" name="Pelta-class Frigate" hidden="false"/>
     <categoryEntry id="a1ce-1cc4-a94f-5cbe" name="Providence-class Dreadnaught Carrier" hidden="false"/>
     <categoryEntry id="0252-613d-1528-9434" name="Recusant-class Destroyer" hidden="false"/>
+    <categoryEntry id="1033-4475-51fe-2d49" name="Squadron" hidden="false">
+      <comment>Summa squadron limit category. Add to each squadron model.</comment>
+      <modifiers>
+        <modifier type="set" field="375b-f9dd-8bb4-ff49" value="4.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="375b-f9dd-8bb4-ff49" type="min"/>
+      </constraints>
+    </categoryEntry>
+    <categoryEntry id="b480-bb94-e584-7963" name="Unique Squadrons" hidden="false">
+      <modifiers>
+        <modifier type="set" field="f8aa-b49d-9cdc-1dc3" value="2.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="f8aa-b49d-9cdc-1dc3" type="max"/>
+      </constraints>
+    </categoryEntry>
+    <categoryEntry id="5e3d-2b80-d3a8-dbb8" name="Unique Squadron With Defense tokens" hidden="false">
+      <modifiers>
+        <modifier type="increment" field="7c7c-b927-71a9-9cea" value="1.0">
+          <repeats>
+            <repeat field="limit::points" scope="roster" value="100.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" repeats="1" roundUp="false"/>
+          </repeats>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="7c7c-b927-71a9-9cea" type="max"/>
+      </constraints>
+    </categoryEntry>
   </categoryEntries>
   <forceEntries>
     <forceEntry id="1b44-1532-e7c9-9663" name="Standard" hidden="false">
@@ -418,9 +489,53 @@ If you are opening a roster from a previous version for the first time you will
         <categoryLink id="46f6-5d24-0540-ea56" name="Objectives" hidden="false" targetId="c9d8-3a89-4028-05d0" primary="false"/>
       </categoryLinks>
     </forceEntry>
+    <forceEntry id="3da5-7d59-bd77-4ec5" name="Summa of all things" hidden="false">
+      <categoryLinks>
+        <categoryLink id="3d5e-9f21-6d24-0cb5" name="Acclamator-class Assault Ship" hidden="false" targetId="8c65-1e25-1a94-a65f" primary="false"/>
+        <categoryLink id="e5e8-4422-f65d-58fa" name="Arquitens-class Cruiser" hidden="false" targetId="0b6b-2d9b-bdb2-4ba8" primary="false"/>
+        <categoryLink id="720a-eef1-d723-baf1" name="Assault Frigate Mk II" hidden="false" targetId="62d1-ec41-79d6-0a08" primary="false"/>
+        <categoryLink id="423a-15a7-6c88-807c" name="CR90 Corvette" hidden="false" targetId="319a-5aa9-59e5-30fa" primary="false"/>
+        <categoryLink id="6b6b-0a96-ffad-2e8e" name="Consular-class Cruiser" hidden="false" targetId="4e6e-9ee3-e44b-de5e" primary="false"/>
+        <categoryLink id="8b1f-f7fc-2741-7f6c" name="GR-75 Transport Flotilla" hidden="false" targetId="8180-3b0c-4e1a-d22a" primary="false"/>
+        <categoryLink id="c814-208c-aad9-1776" name="Gladiator-class Star Destroyer" hidden="false" targetId="469b-896c-3ab9-d1b6" primary="false"/>
+        <categoryLink id="0ee7-a397-8c75-307b" name="Gozanti-class Flotilla" hidden="false" targetId="3c87-8b05-e880-8118" primary="false"/>
+        <categoryLink id="868c-f06f-afce-c17c" name="Hammerhead Corvette" hidden="false" targetId="a934-33f8-cb37-c53d" primary="false"/>
+        <categoryLink id="f208-e3ce-a8fb-f257" name="Hardcell-class" hidden="false" targetId="9aea-dbf4-376c-b22b" primary="false"/>
+        <categoryLink id="87c0-3364-52dc-e198" name="Interdictor" hidden="false" targetId="d71c-f6f0-4044-3252" primary="false"/>
+        <categoryLink id="8319-7a29-d39b-23ba" name="MC30c Frigate" hidden="false" targetId="167d-fd4d-28e2-f646" primary="false"/>
+        <categoryLink id="ef39-8afe-f90f-bfb8" name="Modified Pelta-class Ship" hidden="false" targetId="9810-b289-b172-52b4" primary="false"/>
+        <categoryLink id="79e5-f9bb-49bd-6a56" name="Munificent-class Frigate" hidden="false" targetId="748a-3a7d-d223-580f" primary="false"/>
+        <categoryLink id="5fef-5484-a01f-1905" name="Nebulon-B Frigate" hidden="false" targetId="e589-c88e-f2d0-7413" primary="false"/>
+        <categoryLink id="1987-cae3-9edd-c41f" name="Pelta-class Frigate" hidden="false" targetId="d53e-d6ae-cd55-7265" primary="false"/>
+        <categoryLink id="7887-ed7c-2421-f7be" name="Quasar Fire Cruiser-Carrier" hidden="false" targetId="0fba-00f3-05fd-d2b7" primary="false"/>
+        <categoryLink id="957f-6b22-1a2c-179f" name="Raider-class Corvette" hidden="false" targetId="9ef5-a2c4-bc40-18b7" primary="false"/>
+        <categoryLink id="9e41-cde6-8260-86eb" name="Victory-class Star Destroyer" hidden="false" targetId="7fb1-7ee5-3690-d880" primary="false"/>
+        <categoryLink id="4a37-07f8-67f8-155f" name="Flotilla" hidden="false" targetId="85e7-c532-9071-4160" primary="false"/>
+        <categoryLink id="1a0a-5b9d-f730-99a2" name="Squadrons" hidden="false" targetId="f0dc-ae6a-6219-19ef" primary="false">
+          <modifiers>
+            <modifier type="increment" field="6b5d-324a-4a3a-2bf5" 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="6b5d-324a-4a3a-2bf5" type="max"/>
+          </constraints>
+        </categoryLink>
+        <categoryLink id="5538-01db-dbec-2de2" name="Objectives" hidden="false" targetId="c9d8-3a89-4028-05d0" primary="false"/>
+      </categoryLinks>
+    </forceEntry>
   </forceEntries>
   <selectionEntries>
     <selectionEntry id="5f48-a1c4-7986-1f40" name="Navigation Objective" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="3457-d7b9-e215-f2f2" value="0.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="7a16-95b2-4475-a8dc" type="max"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="3457-d7b9-e215-f2f2" type="min"/>
@@ -688,6 +803,13 @@ If the defender is one of the first player&apos;s ships, the attacker can resolv
       </costs>
     </selectionEntry>
     <selectionEntry id="e868-fe52-8679-4e1b" name="Assault Objective" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="484c-2c0d-90b3-050c" value="0.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="deae-3690-501c-2705" type="max"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="484c-2c0d-90b3-050c" type="min"/>
@@ -965,6 +1087,13 @@ After deploying fleets, the second player places 3 facedown command dials in a s
       </costs>
     </selectionEntry>
     <selectionEntry id="e6cf-4ff3-f8da-22ee" name="Defense Objective" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="a374-fa52-5dc1-a0e1" value="0.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="3da5-7d59-bd77-4ec5" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="a374-fa52-5dc1-a0e1" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="7ffb-6656-3cb3-6089" type="max"/>
@@ -1559,6 +1688,56 @@ While an objective ship or squadron is defending, before it suffers damage, it m
         <cost name="pts" typeId="points" value="0.0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="8b49-590a-9428-594d" name="Scenario Objective" hidden="false" collective="false" import="true" type="unit">
+      <constraints>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="d209-e0d7-0cb6-dfdc" type="max"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink id="d205-6951-b3d0-82fd" name="Objectives" hidden="false" targetId="c9d8-3a89-4028-05d0" primary="true"/>
+      </categoryLinks>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="9623-6468-e52f-e333" name="Scenario Objective" hidden="false" collective="false" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="4f86-cced-0107-32ef" type="max"/>
+          </constraints>
+          <selectionEntries>
+            <selectionEntry id="1b8a-cfe6-a587-9139" name="Summa of all Things" hidden="false" collective="false" import="true" type="model">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d294-4f42-f604-dd35" type="max"/>
+                <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="add8-ec9d-76f4-ed26" type="max"/>
+              </constraints>
+              <profiles>
+                <profile id="b1f0-d5c8-8b0e-9092" name="Summa of all Things" hidden="false" typeId="8947-c5ed-0bcd-acd6" typeName="8.5 Scenario Objective">
+                  <characteristics>
+                    <characteristic name="Setup" typeId="4fb2-570c-5adb-1499">This scenario is played on a 3&apos; x 3&apos; play area. The setup area is the entire play area. Players will set up on opposite sides of this play area.
+Before placing obstacles, the second player places the Summa-verminoth obstacle in the center of the setup area. Then place objectives as normal, excluding the station, in the setup area. Obstacles must be placed beyond distance 3 of the edges of the play area and beyond distance 1 of each other.
+After placing the obstacles, the players alternate placing a total of five coaxium canister objective tokens in the setup area, starting with the second player. The first four coaxium canisters must be placed within distance 1 of the Summa-verminoth and not within distance 1 of any other coaxium canister. The fifth coaxium canister must be placed touching the Summa-verminoth and not overlapping any other coaxium canister.
+Squadrons must be placed within distance 1 of a friendly ship. They may be placed outside deployment zones but not outside the setup area.</characteristic>
+                    <characteristic name="Special Rule" typeId="86dc-37ee-09a2-6c94">Making up lost time: At the start of the first round, each of the second player&apos;s ships gain a [navigate] token.
+Volatile Coaxium: Coaxium canisters cannot be moved by [strategic].
+Coaxium Recovery: When a ship or unique squadron activates, its controlling player may chose one coaxium canister at distance 1 of that ship or unique squadron to recover. Remove the chosen coaxium canister from the play area and place it on the activating ship or unique squadron&apos;s card.
+When a ship or unique squadron that has any recovered coaxium canisters is destroyed, the opposing player places them in the play area touching that model&apos;s base before the model is removed.
+A ship or unique squadron can have multiple coaxium canisters on its card.
+The Maelstrom: Starting on the second round, at the start of each round and before any player resolves any effects, the second player rolls a blue die and consults the Maelstrom effects chart. Maelstrom effects last until the end of the round.</characteristic>
+                    <characteristic name="End of Round" typeId="f650-7650-beea-be8d">Remove the Summa-verminoth control token from the play area.
+If the Summa-verminoth is within a player&apos;s deployment zone, the game ends in a loss for that player.
+</characteristic>
+                    <characteristic name="End of Game" typeId="6a53-f6fa-d9c8-9f3a">At the end of the game check to see if either player has any ships in the play area. If a player has no ships in the play area, they lose. If both players still have ships in the play area, the player who has the most coaxium canisters on friendly ship and unique squadron cards wins. If neither player has more coaxium canisters on freindly ship and unique squadron cards, the game ends in a draw.</characteristic>
+                    <characteristic name="Victory Token Value" typeId="e3f7-99d8-c815-63f2"/>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <costs>
+        <cost name="pts" typeId="points" value="0.0"/>
+      </costs>
+    </selectionEntry>
   </selectionEntries>
   <sharedSelectionEntries>
     <selectionEntry id="4a8e-0cd7-d82c-267d" name="Modification" hidden="false" collective="false" import="true" type="upgrade">
@@ -1579,40 +1758,6 @@ While an objective ship or squadron is defending, before it suffers damage, it m
         <cost name="pts" typeId="points" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="bb91-2395-c338-55b1" name="Unique Squadron With Defense Tokens" hidden="false" collective="false" import="true" type="upgrade">
-      <modifiers>
-        <modifier type="increment" field="e445-d275-84a3-1bd7" value="1.0">
-          <repeats>
-            <repeat field="limit::points" scope="roster" value="100.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="model" repeats="1" roundUp="false"/>
-          </repeats>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5934-aa54-c74f-e796" type="min"/>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="8602-1eff-a253-cb62" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="e445-d275-84a3-1bd7" type="max"/>
-      </constraints>
-      <costs>
-        <cost name="pts" typeId="points" value="0.0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="8035-580d-5d85-dc3b" name="Flotilla" hidden="false" collective="false" import="true" type="upgrade">
-      <modifiers>
-        <modifier type="set" field="4d40-a209-869a-13dc" value="2.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="d57e-9908-0acf-1ebf" type="atLeast"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c2a2-19bb-a248-39d8" type="min"/>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="923b-e722-7136-9c09" type="max"/>
-        <constraint field="selections" scope="roster" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="4d40-a209-869a-13dc" type="max"/>
-      </constraints>
-      <costs>
-        <cost name="pts" typeId="points" value="0.0"/>
-      </costs>
-    </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
     <rule id="7022-8686-4ec8-eb64" name="Counter X" hidden="false">