diff --git a/Dropfleet Commander.gst b/Dropfleet Commander.gst
index 36d7c04..ea3dc16 100644
--- a/Dropfleet Commander.gst	
+++ b/Dropfleet Commander.gst	
@@ -149,7 +149,6 @@
         </categoryLink>
         <categoryLink id="8842-9427-6db6-ee5f" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e09a-442f-b6be-46a6" type="min"/>
             <constraint field="selections" scope="force" value="4" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ded0-42a3-8028-ab68" type="max"/>
           </constraints>
         </categoryLink>
@@ -176,7 +175,6 @@
       <categoryLinks>
         <categoryLink id="6a2a-9f3c-229a-d9b9" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6a9a-9267-1a27-6238" type="min"/>
             <constraint field="selections" scope="force" value="6" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fab4-8742-d000-2dc1" type="max"/>
           </constraints>
         </categoryLink>
@@ -227,7 +225,6 @@
       <categoryLinks>
         <categoryLink id="b547-7e3b-4681-a6b9" name="Battlegroups" hidden="false" targetId="bb7a-03b7-dbdf-c542" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="af9c-53f1-772b-6639" type="min"/>
             <constraint field="selections" scope="force" value="7" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="098a-da2c-210a-8330" type="max"/>
           </constraints>
         </categoryLink>
@@ -269,14 +266,6 @@
         </categoryLink>
       </categoryLinks>
     </forceEntry>
-    <forceEntry id="74ec-9165-2793-0744" name="Ship Browser" hidden="false">
-      <categoryLinks>
-        <categoryLink id="4177-e92e-86a9-e3de" name="Light" hidden="false" targetId="627b-146d-b78d-af3c" primary="false"/>
-        <categoryLink id="4bc3-5c24-dd8e-2754" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="false"/>
-        <categoryLink id="26ee-9231-c27d-734b" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="false"/>
-        <categoryLink id="c53f-9a01-0fce-973e" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="false"/>
-      </categoryLinks>
-    </forceEntry>
     <forceEntry id="053e-95bc-5ec1-51c5" name="Terrain" hidden="false">
       <categoryLinks>
         <categoryLink id="20ce-a80a-d9a5-c1b4" name="Clusters" hidden="false" targetId="d454-56c9-ca87-79ce" primary="false"/>
@@ -293,7 +282,6 @@
     <entryLink id="faad-aa0b-0103-280f" name="Medium Space Station" hidden="false" collective="false" import="true" targetId="3f23-ae01-996c-9dbd" type="selectionEntry"/>
     <entryLink id="fd9a-a334-d290-3a4e" name="Small Cluster" hidden="false" collective="false" import="true" targetId="9ea0-2d05-f377-5ab0" type="selectionEntry"/>
     <entryLink id="e5dd-ad97-0a06-4e2f" name="Small Space Station" hidden="false" collective="false" import="true" targetId="df4f-4a71-603a-020b" type="selectionEntry"/>
-    <entryLink id="110b-1c70-7f28-18fa" name="Princess Cruise Liner" hidden="false" collective="false" import="true" targetId="ba37-0d61-31f8-abf7" type="selectionEntry"/>
   </entryLinks>
   <infoLinks>
     <infoLink id="648d-ece4-2019-6ade" name="Notes" hidden="false" targetId="4b38-af5a-5bb1-7260" type="rule"/>
@@ -842,79 +830,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="ba37-0d61-31f8-abf7" name="Princess Cruise Liner" hidden="false" collective="false" import="true" type="model">
-      <profiles>
-        <profile id="b139-6ffc-ebbd-4fbc" name="Princess Cruise Liner" publicationId="bb34-1413-pubN71061" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
-          <characteristics>
-            <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">4&quot;</characteristic>
-            <characteristic name="Sig" typeId="1402-313c-914d-f053">3&quot;</characteristic>
-            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">10&quot;</characteristic>
-            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">12</characteristic>
-            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">4+</characteristic>
-            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">2</characteristic>
-            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1-4</characteristic>
-            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">M</characteristic>
-            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Atmospheric, Civilian Transport, Full Cloak</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="eb76-fd92-67ca-edc8" name="Princess Cruise Liner A - Asteroid Clearance Lasers" hidden="false" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon">
-          <characteristics>
-            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">4+</characteristic>
-            <characteristic name="Attacks" typeId="00d0-7374-e403-ad78">2</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">F/S/R</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Close Action</characteristic>
-          </characteristics>
-        </profile>
-      </profiles>
-      <infoLinks>
-        <infoLink id="c6e7-ea20-dd6e-98e7" name="Civilian Transport" hidden="false" targetId="2fb8-a8c6-77da-bbb9" type="rule"/>
-        <infoLink id="c25f-ecf0-d95a-ba97" name="Atmospheric" hidden="false" targetId="32d9-8628-d42c-4ddd" type="rule"/>
-        <infoLink id="efde-998b-7bf1-5b6a" name="Full Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
-        <infoLink id="0cc5-f7b9-5e2e-243b" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
-      </infoLinks>
-      <categoryLinks>
-        <categoryLink id="4852-9207-42bd-b709" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="5"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="f6fa-6fbd-c97c-f541" name="Princess Cruise Liners" hidden="false" collective="false" import="true" type="unit">
-      <entryLinks>
-        <entryLink id="7c9c-5553-c80e-836f" name="Princess Cruise Liner" hidden="false" collective="false" import="true" targetId="ba37-0d61-31f8-abf7" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fea8-0e48-216d-8d7e" type="min"/>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2708-2121-e721-163f" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="0736-c512-2f98-e170" name="Princess Cruise Liner" hidden="false" collective="false" import="true" targetId="ba37-0d61-31f8-abf7" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dfed-c8c2-cf2f-c326" type="min"/>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fb72-e004-3540-5c9f" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="fff3-fe8d-494a-31a7" name="Princess Cruise Liner" hidden="false" collective="false" import="true" targetId="ba37-0d61-31f8-abf7" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ed2f-a0ab-1502-f034" type="min"/>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5943-19db-79c6-d289" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="4d0a-34d1-bdfd-ccc8" name="Princess Cruise Liner" hidden="false" collective="false" import="true" targetId="ba37-0d61-31f8-abf7" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8691-64c7-7812-b7e8" type="min"/>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a896-4546-0513-87c0" type="max"/>
-          </constraints>
-        </entryLink>
-      </entryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry type="upgrade" import="true" name="Flagship (H)" hidden="false" id="f413-1384-f5c6-44c1" collective="false">
       <constraints>
         <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="81a6-198d-a483-7b9c" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
diff --git a/Multi-faction.cat b/Multi-faction.cat
index 9955abd..657cc8b 100644
--- a/Multi-faction.cat
+++ b/Multi-faction.cat
@@ -3,21 +3,6 @@
   <sharedSelectionEntries>
     <selectionEntry type="upgrade" import="true" name="----- Ships -----" hidden="false" id="fb85-98fe-96c8-abd1"/>
     <selectionEntry type="model" import="true" name="Pungari Thresher Hive Ship" hidden="false" id="91db-c1d9-41b6-06f2" collective="false" publicationId="da17-7d78-79da-7077" page="18">
-      <modifiers>
-        <modifier type="set" value="3" field="7fce-c7be-f7fb-a7fe">
-          <conditions>
-            <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" value="2" field="7fce-c7be-f7fb-a7fe">
-          <conditions>
-            <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="7fce-c7be-f7fb-a7fe" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-      </constraints>
       <profiles>
         <profile name="Thresher" typeId="ecce-1380-e182-c89e" typeName="Ship" hidden="false" id="82ac-a7b2-6ea1-103e">
           <characteristics>
@@ -251,19 +236,39 @@
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Centurion Grand Cruisers" hidden="false" id="0483-4ffa-7e63-bb82" collective="false">
       <modifiers>
-        <modifier type="set" value="2" field="99ef-5ef4-7b04-c75f">
-          <conditions>
-            <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </conditions>
+        <modifier type="set" value="1" field="dfc2-18b6-0204-17a1">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="5810-52c0-23f0-8f9f" shared="true"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="45c0-0980-7ede-27b1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
-        <modifier type="set" value="3" field="99ef-5ef4-7b04-c75f">
-          <conditions>
-            <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </conditions>
+        <modifier type="set" value="2" field="dfc2-18b6-0204-17a1">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="5810-52c0-23f0-8f9f" shared="true"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
+        <modifier type="set" value="3" field="dfc2-18b6-0204-17a1">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="5810-52c0-23f0-8f9f" shared="true"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="99ef-5ef4-7b04-c75f" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+        <constraint type="max" value="-1" field="selections" scope="force" shared="true" id="dfc2-18b6-0204-17a1" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
       </constraints>
       <entryLinks>
         <entryLink import="true" name="Centurion Grand Cruiser" hidden="false" id="8859-d27f-768c-e1fd" collective="false" targetId="c2d4-cebd-6609-c177" type="selectionEntry">
@@ -299,19 +304,39 @@
     </selectionEntry>
     <selectionEntry type="unit" import="true" name="Palatine Command Barge" hidden="false" id="f037-c598-d6fe-3356" collective="false">
       <modifiers>
+        <modifier type="set" value="1" field="d130-65b7-cd79-fe11">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="5810-52c0-23f0-8f9f" shared="true"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="45c0-0980-7ede-27b1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
         <modifier type="set" value="2" field="d130-65b7-cd79-fe11">
-          <conditions>
-            <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="5810-52c0-23f0-8f9f" shared="true"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
         <modifier type="set" value="3" field="d130-65b7-cd79-fe11">
-          <conditions>
-            <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="5810-52c0-23f0-8f9f" shared="true"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="d130-65b7-cd79-fe11" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+        <constraint type="max" value="-1" field="selections" scope="force" shared="true" id="d130-65b7-cd79-fe11" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
       </constraints>
       <entryLinks>
         <entryLink import="true" name="Palatine Command Barge" hidden="false" id="abe5-a7ca-5f0b-3896" collective="false" targetId="3f5b-d59d-96a0-d71d" type="selectionEntry">
diff --git a/Post-Human Republic.cat b/Post-Human Republic.cat
index f2307cf..7810970 100644
--- a/Post-Human Republic.cat	
+++ b/Post-Human Republic.cat	
@@ -798,21 +798,6 @@
       </entryLinks>
     </selectionEntry>
     <selectionEntry id="cfc2-8315-a376-453f" name="Calypso Frigate" hidden="false" collective="false" import="true" type="model" publicationId="6b9b-4137-d953-56b1" page="29">
-      <modifiers>
-        <modifier type="set" field="adb3-30b9-9e20-c089" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="adb3-30b9-9e20-c089" value="3">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="adb3-30b9-9e20-c089" type="max"/>
-      </constraints>
       <profiles>
         <profile id="815b-6afd-fd6f-9100" name="Calypso" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -1036,21 +1021,6 @@
       </entryLinks>
     </selectionEntry>
     <selectionEntry id="a0fd-8cb1-f394-f926" name="Jason Blockade Runner" hidden="false" collective="false" import="true" type="model" publicationId="6b9b-4137-d953-56b1" page="36">
-      <modifiers>
-        <modifier type="set" field="5959-2476-6610-1aea" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="5959-2476-6610-1aea" value="3">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="5959-2476-6610-1aea" type="max"/>
-      </constraints>
       <profiles>
         <profile id="45b4-bd1d-08d4-f329" name="Jason" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -1083,21 +1053,6 @@
       </entryLinks>
     </selectionEntry>
     <selectionEntry id="6c2f-5699-9bea-fd8f" name="Odysseus Blockade Runner" hidden="false" collective="false" import="true" type="model" publicationId="6b9b-4137-d953-56b1" page="37">
-      <modifiers>
-        <modifier type="set" field="aea6-ffc6-ebf7-feb4" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="aea6-ffc6-ebf7-feb4" value="3">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="aea6-ffc6-ebf7-feb4" type="max"/>
-      </constraints>
       <profiles>
         <profile id="844a-5f8c-033c-7002" name="Odysseus" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -1739,14 +1694,14 @@
     </selectionEntry>
     <selectionEntry id="7fc9-e943-9036-4b3e" name="Jason Blockade Runners" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="f696-9626-e8c1-fde8" value="3">
+        <modifier type="set" field="f696-9626-e8c1-fde8" value="2">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
           </conditions>
         </modifier>
-        <modifier type="set" field="f696-9626-e8c1-fde8" value="2">
+        <modifier type="set" field="f696-9626-e8c1-fde8" value="3">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
           </conditions>
         </modifier>
       </modifiers>
@@ -1769,14 +1724,14 @@
     </selectionEntry>
     <selectionEntry id="ea69-b5fa-67aa-92ff" name="Odysseus Blockade Runners" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="6203-4c65-2d5c-9229" value="3">
+        <modifier type="set" field="6203-4c65-2d5c-9229" value="2">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
           </conditions>
         </modifier>
-        <modifier type="set" field="6203-4c65-2d5c-9229" value="2">
+        <modifier type="set" field="6203-4c65-2d5c-9229" value="3">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
           </conditions>
         </modifier>
       </modifiers>
@@ -1814,14 +1769,14 @@
     </selectionEntry>
     <selectionEntry id="7f4c-a918-65c1-dd1f" name="Ourania Swiftlinks" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="9ee6-efab-3dd8-1a96" value="3">
+        <modifier type="set" field="9ee6-efab-3dd8-1a96" value="2">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
           </conditions>
         </modifier>
-        <modifier type="set" field="9ee6-efab-3dd8-1a96" value="2">
+        <modifier type="set" field="9ee6-efab-3dd8-1a96" value="3">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
           </conditions>
         </modifier>
       </modifiers>
diff --git a/Resistance.cat b/Resistance.cat
index 2a10802..a4e5cb9 100644
--- a/Resistance.cat
+++ b/Resistance.cat
@@ -386,21 +386,6 @@
       </costs>
     </selectionEntry>
     <selectionEntry id="a842-593c-51f5-9c0d" name="Triumvir Repair Cruiser" hidden="false" collective="false" import="true" type="model" publicationId="71d6-14ad-06a1-10e4" page="12">
-      <modifiers>
-        <modifier type="set" field="5e06-7a44-d802-a2f8" value="3">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="5e06-7a44-d802-a2f8" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5e06-7a44-d802-a2f8" type="max"/>
-      </constraints>
       <profiles>
         <profile id="fcd9-88f3-5423-abf8" name="Triumvir" publicationId="07fb-79fc-ad90-6f9e" page="208" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -1195,19 +1180,34 @@
         <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
-    </selectionEntry>
-    <selectionEntry id="ee12-1bad-78e3-c0e8" name="Gladiator Grand Cruisers" hidden="false" collective="false" import="true" type="unit">
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="ef6a-8664-3466-0978" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
       <modifiers>
-        <modifier type="set" field="7d4d-8655-0bd0-1f04" value="3">
+        <modifier type="set" value="2" field="ef6a-8664-3466-0978">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" value="3" field="ef6a-8664-3466-0978">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
           </conditions>
         </modifier>
+      </modifiers>
+    </selectionEntry>
+    <selectionEntry id="ee12-1bad-78e3-c0e8" name="Gladiator Grand Cruisers" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
         <modifier type="set" field="7d4d-8655-0bd0-1f04" value="2">
           <conditions>
             <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
           </conditions>
         </modifier>
+        <modifier type="set" field="7d4d-8655-0bd0-1f04" value="3">
+          <conditions>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="7d4d-8655-0bd0-1f04" type="max"/>
diff --git a/Scourge.cat b/Scourge.cat
index c7e7f00..e502884 100644
--- a/Scourge.cat
+++ b/Scourge.cat
@@ -1641,14 +1641,14 @@
     </selectionEntry>
     <selectionEntry id="c20c-da3b-dc35-ff87" name="Parasite Radiation Leeches" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="837f-d552-5e0e-8604" value="3">
+        <modifier type="set" field="837f-d552-5e0e-8604" value="2">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
           </conditions>
         </modifier>
-        <modifier type="set" field="837f-d552-5e0e-8604" value="2">
+        <modifier type="set" field="837f-d552-5e0e-8604" value="3">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
           </conditions>
         </modifier>
       </modifiers>
diff --git a/Shaltari Tribes.cat b/Shaltari Tribes.cat
index a635d88..e63b88a 100644
--- a/Shaltari Tribes.cat	
+++ b/Shaltari Tribes.cat	
@@ -481,21 +481,6 @@
       </costs>
     </selectionEntry>
     <selectionEntry id="bd5e-5169-d54b-bd02" name="Scoria Heavy Carrier" hidden="false" collective="false" import="true" type="model" publicationId="da17-7d78-79da-7077" page="17">
-      <modifiers>
-        <modifier type="set" field="db03-4801-74c4-794e" value="3">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="db03-4801-74c4-794e" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="db03-4801-74c4-794e" type="max"/>
-      </constraints>
       <profiles>
         <profile id="788c-102d-2be9-7ce1" name="Scoria" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -812,21 +797,6 @@
       </entryLinks>
     </selectionEntry>
     <selectionEntry id="26c1-9c23-f51a-6d07" name="Opal Frigate" hidden="false" collective="false" import="true" type="model" publicationId="da17-7d78-79da-7077" page="30">
-      <modifiers>
-        <modifier type="set" field="aaa1-5582-3ebc-ded4" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="aaa1-5582-3ebc-ded4" value="3">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="aaa1-5582-3ebc-ded4" type="max"/>
-      </constraints>
       <profiles>
         <profile id="081e-bd22-b0a4-bd0f" name="Opal" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -1428,6 +1398,21 @@
         <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="e9b5-7b93-c663-d57c" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
+      <modifiers>
+        <modifier type="set" value="2" field="e9b5-7b93-c663-d57c">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" value="3" field="e9b5-7b93-c663-d57c">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="dae4-232a-237d-54b3" name="Amber Cruisers" hidden="false" collective="false" import="true" type="unit">
       <entryLinks>
diff --git a/United Colonies of Mankind.cat b/United Colonies of Mankind.cat
index c7d781d..5b1d86a 100644
--- a/United Colonies of Mankind.cat	
+++ b/United Colonies of Mankind.cat	
@@ -799,21 +799,6 @@
       </entryLinks>
     </selectionEntry>
     <selectionEntry id="dba1-e056-6281-9562" name="Lima Frigate" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="31">
-      <modifiers>
-        <modifier type="increment" field="bbf7-bde8-3363-1385" value="1">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="increment" field="bbf7-bde8-3363-1385" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="bbf7-bde8-3363-1385" type="max"/>
-      </constraints>
       <profiles>
         <profile id="26e9-ee7d-0444-365b" name="Lima" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -947,21 +932,6 @@
       </entryLinks>
     </selectionEntry>
     <selectionEntry id="6ebc-e179-855e-e295" name="Havana Destroyer" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="35">
-      <modifiers>
-        <modifier type="increment" field="6ddc-1ff9-cd87-2832" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="increment" field="6ddc-1ff9-cd87-2832" value="1">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="6ddc-1ff9-cd87-2832" type="max"/>
-      </constraints>
       <profiles>
         <profile id="cdd9-18f1-4398-1abe" name="Havana" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -1148,21 +1118,6 @@
       </entryLinks>
     </selectionEntry>
     <selectionEntry id="4022-3e27-f25e-7ace" name="Lysander Stealth Lighter" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="41">
-      <modifiers>
-        <modifier type="increment" field="2ba9-9dd4-ea8f-6163" value="1">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="increment" field="2ba9-9dd4-ea8f-6163" value="2">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="2ba9-9dd4-ea8f-6163" type="max"/>
-      </constraints>
       <profiles>
         <profile id="9bf9-d7c9-9e29-afea" name="Lysander" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
@@ -1407,6 +1362,21 @@
         <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="aa6c-e19c-048e-3c82" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
+      <modifiers>
+        <modifier type="set" value="2" field="aa6c-e19c-048e-3c82">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" value="3" field="aa6c-e19c-048e-3c82">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="332a-1b73-07e3-00b0" name="Rio Cruisers" hidden="false" collective="false" import="true" type="unit">
       <entryLinks>
@@ -1635,14 +1605,14 @@
     </selectionEntry>
     <selectionEntry id="4264-ebbd-c34f-4057" name="Havana Destroyers" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="2825-5c45-b5e7-1732" value="3">
+        <modifier type="set" field="2825-5c45-b5e7-1732" value="2">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
           </conditions>
         </modifier>
-        <modifier type="set" field="2825-5c45-b5e7-1732" value="2">
+        <modifier type="set" field="2825-5c45-b5e7-1732" value="3">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b897-0836-3935-a949" type="instanceOf"/>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ddf7-2d82-8a0f-adbd" type="instanceOf"/>
           </conditions>
         </modifier>
       </modifiers>
@@ -1752,6 +1722,21 @@
         <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="1ea1-26bf-78a3-c56c" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
+      <modifiers>
+        <modifier type="set" value="2" field="1ea1-26bf-78a3-c56c">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="b897-0836-3935-a949" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" value="3" field="1ea1-26bf-78a3-c56c">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="ddf7-2d82-8a0f-adbd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="5699-604a-8095-058b" name="Fleet" hidden="false" collective="false" import="true" type="upgrade">
       <modifiers>