From d11f059cf15f21151d8bcf9f3a9bad344630e77d Mon Sep 17 00:00:00 2001
From: John Kemp <kemp.cov@gmail.com>
Date: Tue, 13 Aug 2024 09:14:45 +0100
Subject: [PATCH] Move Centurion/Thresher/Flagship (X) to common locations

Move Centurion and Thresher into new Multi-faction catalogue. Create Shaltari and Resistance weapons catalogues (only weapons for above currently). Move Flagship (X) SEs into system catalogue.
---
 Dropfleet Commander.gst        |  54 ++++-
 Multi-faction.cat              | 130 ++++++++++++
 Post-Human Republic.cat        | 314 +++++------------------------
 Resistance - Weapons.cat       | 109 +++++++++++
 Resistance.cat                 | 146 ++------------
 Scourge.cat                    | 251 +++++-------------------
 Shaltari - Weapons.cat         | 131 +++++++++++++
 Shaltari Tribes.cat            | 167 +++-------------
 United Colonies of Mankind.cat | 347 +++++----------------------------
 9 files changed, 607 insertions(+), 1042 deletions(-)
 create mode 100644 Multi-faction.cat
 create mode 100644 Resistance - Weapons.cat
 create mode 100644 Shaltari - Weapons.cat

diff --git a/Dropfleet Commander.gst b/Dropfleet Commander.gst
index b9ed533..793fcf6 100644
--- a/Dropfleet Commander.gst	
+++ b/Dropfleet Commander.gst	
@@ -892,7 +892,7 @@
       <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="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>
@@ -937,6 +937,58 @@
         <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"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink name="Flagships" hidden="false" id="963c-aef1-6735-d11c" targetId="7907-82a3-5278-4f8b" primary="true"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
+        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
+        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="true" name="Flagship (M)" hidden="false" id="7876-1198-be24-9d63" collective="false">
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="be4e-7390-9fef-0fa9" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink name="Flagships" hidden="false" id="a891-9448-afbd-0fea" targetId="7907-82a3-5278-4f8b" primary="true"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
+        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
+        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="true" name="Flagship (S)" hidden="false" id="5985-0d00-1fcc-b8be" collective="false">
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="6851-f07f-679d-5205" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink name="Flagships" hidden="false" id="66dd-358d-8963-745d" targetId="7907-82a3-5278-4f8b" primary="true"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
+        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
+        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="true" name="Flagship (S2)" hidden="false" id="b338-59f9-6801-038a" collective="false">
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="8177-6908-c960-7c56" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink name="Flagships" hidden="false" id="c805-85a1-aeed-bddb" targetId="7907-82a3-5278-4f8b" primary="true"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
+        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
+        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
+      </costs>
+    </selectionEntry>
   </sharedSelectionEntries>
   <sharedSelectionEntryGroups>
     <selectionEntryGroup id="3e39-461e-6d47-16b3" name="Sector" hidden="false" collective="false" import="true" defaultSelectionEntryId="ae60-70f5-42a1-8817">
diff --git a/Multi-faction.cat b/Multi-faction.cat
new file mode 100644
index 0000000..b0ab01f
--- /dev/null
+++ b/Multi-faction.cat
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<catalogue library="true" id="edb7-ec70-1989-b4b3" name="Multi-faction" gameSystemId="bb34-1413-3527-b957" gameSystemRevision="17" revision="1" authorUrl="https://github.com/BSData/dropfleet-commander/issues" authorName="John Kemp" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <sharedSelectionEntries>
+    <selectionEntry type="model" import="true" name="Centurion Grand Cruiser" hidden="false" id="eb98-fa81-e16b-bde6" collective="false" publicationId="71d6-14ad-06a1-10e4" page="14">
+      <profiles>
+        <profile name="Centurion" typeId="ecce-1380-e182-c89e" typeName="Ship" hidden="false" id="5358-3263-d8ec-fe5c">
+          <characteristics>
+            <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">4&quot;</characteristic>
+            <characteristic name="Sig" typeId="1402-313c-914d-f053">6&quot;</characteristic>
+            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">7&quot;</characteristic>
+            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">15</characteristic>
+            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">2+</characteristic>
+            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">3</characteristic>
+            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1-2</characteristic>
+            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
+            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Ablative Armour</characteristic>
+          </characteristics>
+          <modifiers>
+            <modifier type="append" value=", Rare" field="4717-adad-0be5-3c60">
+              <conditions>
+                <condition type="notInstanceOf" value="1" field="selections" scope="primary-catalogue" childId="5810-52c0-23f0-8f9f" shared="true" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+              <comment>nospace</comment>
+            </modifier>
+          </modifiers>
+        </profile>
+      </profiles>
+      <infoLinks>
+        <infoLink name="Ablative Armour" id="527c-ccbc-b463-6098" hidden="false" targetId="38d0-f9e6-a208-1f17" type="rule"/>
+        <infoLink name="Rare" id="731b-aaaf-b84b-8861" hidden="true" type="rule" targetId="becc-b3c9-c26c-abde">
+          <modifiers>
+            <modifier type="set" value="false" field="hidden">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="primary-catalogue" childId="889e-ba35-f5c2-036d" shared="true" includeChildSelections="false" includeChildForces="false"/>
+                    <condition type="instanceOf" value="1" field="selections" scope="primary-catalogue" childId="620d-f7e0-131c-2882" shared="true" includeChildSelections="false" includeChildForces="false"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink name="Heavy" hidden="false" id="5f45-4ff4-3b95-8f07" targetId="1342-a92d-424c-140a" primary="true"/>
+      </categoryLinks>
+      <entryLinks>
+        <entryLink import="true" name="Flagship (H)" hidden="false" id="c031-cefd-a8c3-ca5b" collective="false" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
+        <entryLink import="true" name="XN-31 Pair" hidden="false" id="54d0-50d9-c450-8c77" type="selectionEntry" targetId="ffb3-86e8-f46f-31cb" sortIndex="1"/>
+        <entryLink import="true" name="N-31 Port" hidden="false" id="6671-d2e0-5b1e-32b9" type="selectionEntry" targetId="e44c-f2ed-607c-2feb" sortIndex="2"/>
+        <entryLink import="true" name="N-31 Starboard" hidden="false" id="086b-7b7f-a67e-aa9e" type="selectionEntry" targetId="da50-f025-3ebe-5e2f" sortIndex="3"/>
+        <entryLink import="true" name="NC-3 Missiles" hidden="false" id="a163-8bae-c6e2-23dc" type="selectionEntry" targetId="79ea-671f-2e64-5215" sortIndex="4"/>
+      </entryLinks>
+      <costs>
+        <cost name="pts" typeId="e888-2584-886f-7f2c" value="135"/>
+        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
+        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
+      </costs>
+    </selectionEntry>
+    <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>
+        <modifier type="set" value="-1" field="7fce-c7be-f7fb-a7fe">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="74ec-9165-2793-0744" 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>
+            <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">4&quot;</characteristic>
+            <characteristic name="Sig" typeId="1402-313c-914d-f053">6&quot;</characteristic>
+            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">6&quot;</characteristic>
+            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">14</characteristic>
+            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">3+</characteristic>
+            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">4</characteristic>
+            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1</characteristic>
+            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
+            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Launch, Rare, Reinforced Armour</characteristic>
+          </characteristics>
+          <modifiers>
+            <modifier type="append" value="/6+" field="41bf-5c81-5b4b-0aec">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="primary-catalogue" childId="c240-e6a9-6a41-8643" shared="true" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+              <comment>nospace</comment>
+            </modifier>
+          </modifiers>
+        </profile>
+      </profiles>
+      <infoLinks>
+        <infoLink name="Reinforced Armour" id="4163-3ab3-9d0c-b69d" hidden="false" targetId="8560-b10d-f4cb-d837" type="rule"/>
+        <infoLink name="Rare" id="e9e0-ebc1-a032-ffbd" hidden="false" targetId="becc-b3c9-c26c-abde" type="rule"/>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink name="Heavy" hidden="false" id="28d3-4b15-a753-0e08" targetId="1342-a92d-424c-140a" primary="true"/>
+      </categoryLinks>
+      <costs>
+        <cost name="pts" typeId="e888-2584-886f-7f2c" value="150"/>
+        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="6"/>
+        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
+      </costs>
+      <entryLinks>
+        <entryLink import="true" name="Boarding Pods (F)" hidden="false" id="55cf-bda5-6897-95eb" type="selectionEntry" targetId="468b-b193-3553-172e"/>
+        <entryLink import="true" name="Boarding Pods (St)" hidden="false" id="1268-e4ef-6ef8-f765" type="selectionEntry" targetId="4322-3e6b-1b0c-551c"/>
+        <entryLink import="true" name="Boarding Pods (Po)" hidden="false" id="65ed-1ae7-a2fa-80d5" type="selectionEntry" targetId="4513-d78c-46ba-04b1"/>
+        <entryLink import="true" name="Pungari Bulk Landers" hidden="false" id="9368-551c-38d1-a49d" type="selectionEntry" targetId="1b65-a31c-47e5-52cf"/>
+        <entryLink import="true" name="Pungari Bombers" hidden="false" id="454b-6911-36bc-ec10" type="selectionEntry" targetId="a2a5-6ba2-bb76-6f21"/>
+      </entryLinks>
+    </selectionEntry>
+  </sharedSelectionEntries>
+  <catalogueLinks>
+    <catalogueLink type="catalogue" name="Resistance - Weapons" id="bbed-6906-5d48-1e07" targetId="ed7e-81bf-ed24-0dfb"/>
+    <catalogueLink type="catalogue" name="Shaltari - Weapons" id="9360-07bd-126c-7cc0" targetId="ef31-352e-ede6-13ec"/>
+  </catalogueLinks>
+</catalogue>
diff --git a/Post-Human Republic.cat b/Post-Human Republic.cat
index 3682929..296b6c7 100644
--- a/Post-Human Republic.cat	
+++ b/Post-Human Republic.cat	
@@ -12,7 +12,7 @@
     <entryLink id="7893-9257-a7eb-1d23" name="Andromeda Escort Carrier" hidden="false" collective="false" import="true" targetId="f3c1-8ada-90b9-c94e" type="selectionEntry"/>
     <entryLink id="f467-8c9f-7e88-94c3" name="Bellerophon Heavy Cruiser" hidden="false" collective="false" import="true" targetId="e8b4-d12b-4924-432f" type="selectionEntry"/>
     <entryLink id="a8c4-57ec-0687-03a3" name="Calypso Frigate" hidden="false" collective="false" import="true" targetId="cfc2-8315-a376-453f" type="selectionEntry"/>
-    <entryLink id="c934-c38d-9f77-5764" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="5f21-e98d-93f4-8fdb" type="selectionEntry"/>
+    <entryLink id="c934-c38d-9f77-5764" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="eb98-fa81-e16b-bde6" type="selectionEntry"/>
     <entryLink id="1bd7-6370-65fa-d604" name="Echo Corvette" hidden="false" collective="false" import="true" targetId="dbfa-05bd-bc3e-3b40" type="selectionEntry"/>
     <entryLink id="8bc9-6193-a671-8d70" name="Europa Frigate" hidden="false" collective="false" import="true" targetId="cecd-aed0-f849-87db" type="selectionEntry"/>
     <entryLink id="67b4-025c-7118-66be" name="Ganymede Assault Troopship" hidden="false" collective="false" import="true" targetId="9e6c-32b0-c1d9-2f3c" type="selectionEntry"/>
@@ -38,7 +38,7 @@
     <entryLink id="b031-5846-2510-a8c9" name="Romulus Dreadnought" hidden="false" collective="false" import="true" targetId="5ea2-6b2a-f3be-cfdf" type="selectionEntry"/>
     <entryLink id="6bdb-6b50-f153-5a24" name="Castor Monitor" hidden="false" collective="false" import="true" targetId="e75b-dd10-43be-d9de" type="selectionEntry"/>
     <entryLink id="d4ba-7a13-0652-d407" name="Pollux Escort Frigate" hidden="false" collective="false" import="true" targetId="a14b-ae3b-8aca-2af6" type="selectionEntry"/>
-    <entryLink id="5892-1867-964b-780c" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="12d1-10f4-521e-b853" type="selectionEntry"/>
+    <entryLink id="5892-1867-964b-780c" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="91db-c1d9-41b6-06f2" type="selectionEntry"/>
     <entryLink id="a5d3-495c-e930-0e79" name="Harpocrates Guerrilla Lighter" hidden="false" collective="false" import="true" targetId="47c6-371b-d2d4-38dd" type="selectionEntry"/>
     <entryLink id="9a26-1f81-f8fa-60d4" name="Pegasus Nano-Hive Cutter" hidden="false" collective="false" import="true" targetId="d2da-d8f6-a66e-a37b" type="selectionEntry"/>
     <entryLink id="124d-ba27-deaf-779e" name="Ourania Swiftlink" hidden="false" collective="false" import="true" targetId="35ef-106a-199c-8db2" type="selectionEntry"/>
@@ -108,7 +108,7 @@
         <categoryLink id="a4bf-64cb-c042-3d75" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="864e-cfea-1c99-781a" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="dfe5-022b-45b9-37bc" type="selectionEntry"/>
+        <entryLink id="864e-cfea-1c99-781a" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="285"/>
@@ -182,7 +182,7 @@
         <categoryLink id="9565-409f-e15e-6470" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="a4ad-e07f-70e2-7542" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="dfe5-022b-45b9-37bc" type="selectionEntry"/>
+        <entryLink id="a4ad-e07f-70e2-7542" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="285"/>
@@ -279,7 +279,7 @@
         <categoryLink id="6b2e-42ec-1d75-e62c" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="25ba-46fd-18be-4ee0" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="25ba-46fd-18be-4ee0" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="185"/>
@@ -376,7 +376,7 @@
         <categoryLink id="2ba4-df0a-23a4-45db" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="6afd-d030-f84e-0827" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="6afd-d030-f84e-0827" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="185"/>
@@ -462,7 +462,7 @@
         <categoryLink id="1720-8191-55bf-824a" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="21b8-b7db-f930-6a4f" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="21b8-b7db-f930-6a4f" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="200"/>
@@ -548,7 +548,7 @@
         <categoryLink id="ea58-042e-79f6-eed3" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="5d81-ddfd-2540-7683" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="5d81-ddfd-2540-7683" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="200"/>
@@ -619,7 +619,7 @@
         <categoryLink id="bddd-82fa-e0f2-5d2b" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="7f41-ad80-7d9e-a4c0" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="7f41-ad80-7d9e-a4c0" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="155"/>
@@ -688,7 +688,7 @@
         <categoryLink id="9399-e43f-7790-a380" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="59a9-4742-b2c1-fb51" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="59a9-4742-b2c1-fb51" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="165"/>
@@ -746,7 +746,7 @@
         <categoryLink id="5d2a-84cf-3b50-eccb" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="3139-aa07-5381-9cbb" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="3139-aa07-5381-9cbb" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="180"/>
@@ -823,7 +823,7 @@
         <categoryLink id="5df8-6514-7afe-6d92" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="977d-0c2a-c00b-8a57" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="bb92-8002-0336-3faf" type="selectionEntry"/>
+        <entryLink id="977d-0c2a-c00b-8a57" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="135"/>
@@ -908,7 +908,7 @@
         <categoryLink id="5ada-20af-4c25-41aa" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="969a-107e-26c1-af3b" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="bb92-8002-0336-3faf" type="selectionEntry"/>
+        <entryLink id="969a-107e-26c1-af3b" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="135"/>
@@ -977,7 +977,7 @@
         <categoryLink id="73ed-5627-7044-5a60" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="b902-c832-f160-e60f" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="bb92-8002-0336-3faf" type="selectionEntry"/>
+        <entryLink id="b902-c832-f160-e60f" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="107"/>
@@ -1067,7 +1067,7 @@
         <categoryLink id="48d9-509a-13ea-aa02" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="7702-16bd-117b-6a6e" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="bb92-8002-0336-3faf" type="selectionEntry"/>
+        <entryLink id="7702-16bd-117b-6a6e" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="95"/>
@@ -1155,7 +1155,7 @@
         <categoryLink id="15fc-9336-a695-62ac" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="31ac-567d-667c-b346" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="bb92-8002-0336-3faf" type="selectionEntry"/>
+        <entryLink id="31ac-567d-667c-b346" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="105"/>
@@ -1231,7 +1231,7 @@
         <categoryLink id="97be-dc67-aa4c-96cd" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="6a26-9e9a-c222-3608" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="bb92-8002-0336-3faf" type="selectionEntry"/>
+        <entryLink id="6a26-9e9a-c222-3608" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="115"/>
@@ -1310,7 +1310,7 @@
         <categoryLink id="7573-b9d0-4980-bded" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="8cca-6df8-8eac-96dd" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="bb92-8002-0336-3faf" type="selectionEntry"/>
+        <entryLink id="8cca-6df8-8eac-96dd" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="90"/>
@@ -1468,7 +1468,7 @@
         </profile>
       </profiles>
       <infoLinks>
-        <infoLink id="a528-6614-9ccc-661c" name="**Advanced ECM Suite" hidden="false" targetId="11e9-bf56-6251-4f8e" type="rule"/>
+        <infoLink id="a528-6614-9ccc-661c" name="Advanced ECM Suite" hidden="false" targetId="11e9-bf56-6251-4f8e" type="rule"/>
         <infoLink id="8a7d-88cf-7207-00e6" name="Rare" hidden="false" targetId="becc-b3c9-c26c-abde" type="rule"/>
         <infoLink id="d4ae-7e54-1aef-ea27" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
       </infoLinks>
@@ -2091,9 +2091,9 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e58f-d444-d0f0-8fe1" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="dfe5-022b-45b9-37bc" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="193e-4519-9376-b656" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -2115,15 +2115,15 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e58f-d444-d0f0-8fe1" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="dfe5-022b-45b9-37bc" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="20">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="193e-4519-9376-b656" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -2143,15 +2143,15 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="dfe5-022b-45b9-37bc" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e58f-d444-d0f0-8fe1" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="193e-4519-9376-b656" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -2174,15 +2174,15 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="80">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="193e-4519-9376-b656" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="dfe5-022b-45b9-37bc" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e58f-d444-d0f0-8fe1" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -2207,15 +2207,15 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="100">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="193e-4519-9376-b656" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="80">
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="dfe5-022b-45b9-37bc" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e58f-d444-d0f0-8fe1" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -2642,76 +2642,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="5f21-e98d-93f4-8fdb" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" type="model">
-      <profiles>
-        <profile id="5f5c-7f29-5dc7-79f3" name="Centurion PHR" publicationId="07fb-79fc-ad90-6f9e" page="210" 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">6&quot;</characteristic>
-            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">7&quot;</characteristic>
-            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">14</characteristic>
-            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">2+</characteristic>
-            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">3</characteristic>
-            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1-2</characteristic>
-            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
-            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Ablative Armour</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="2ade-2299-b516-22a3" name="Centurion PHR A - XN-31 Mass Driver Turret Pair" hidden="false" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon">
-          <characteristics>
-            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">2+</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</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Fusillade(2)</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="e6f2-6bc8-7a3b-d45d" name="Centurion PHR B - N-31 Hybrid Gun Battery, Starboard" 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">6</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="c596-6ad8-63a5-a2d6" name="Centurion PHR C - N-31 Hybrid Gun Battery, Port" 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">6</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="1831-17fc-0f2e-f2c3" name="Centurion PHR D - NC-3 Missiles" 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="7a02-d838-4d7c-ed51" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
-        <infoLink id="a87f-fb3f-ab40-8ef1" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
-        <infoLink id="a47e-2bbd-334e-6807" name="Fusillade (X)" hidden="false" targetId="657f-18a5-dde4-5342" type="rule"/>
-        <infoLink id="79f4-a318-0072-3980" name="Ablative Armour" hidden="false" targetId="38d0-f9e6-a208-1f17" type="rule"/>
-      </infoLinks>
-      <categoryLinks>
-        <categoryLink id="a310-7fa8-d6ab-de99" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
-      </categoryLinks>
-      <entryLinks>
-        <entryLink id="c30e-164d-20ba-e9f9" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
-      </entryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="135"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="d968-4132-6ee0-f2fe" name="Centurion Grand Cruisers" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
         <modifier type="set" field="c8b5-bb8c-b909-c9d9" value="2">
@@ -2729,13 +2659,13 @@
         <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="c8b5-bb8c-b909-c9d9" type="max"/>
       </constraints>
       <entryLinks>
-        <entryLink id="9462-0279-6a54-94e2" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="5f21-e98d-93f4-8fdb" type="selectionEntry">
+        <entryLink id="9462-0279-6a54-94e2" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="eb98-fa81-e16b-bde6" type="selectionEntry">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="89a6-df75-5363-cc91" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b0a-0625-fe52-83d5" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="1fe6-0fc7-bc6d-20ff" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="5f21-e98d-93f4-8fdb" type="selectionEntry">
+        <entryLink id="1fe6-0fc7-bc6d-20ff" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="eb98-fa81-e16b-bde6" type="selectionEntry">
           <constraints>
             <constraint field="selections" scope="parent" value="0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f040-b159-4788-ab7b" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5c76-a426-6cef-5d3b" type="max"/>
@@ -3251,7 +3181,7 @@
         <categoryLink id="8f71-18aa-1d14-84ef" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="f976-a5ad-1d11-4a94" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="e58f-d444-d0f0-8fe1" type="selectionEntry"/>
+        <entryLink id="f976-a5ad-1d11-4a94" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="b338-59f9-6801-038a" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="500"/>
@@ -3375,7 +3305,7 @@
         <categoryLink id="fd41-de46-44fd-ce3a" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="0e4a-55f9-485c-e9aa" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="e58f-d444-d0f0-8fe1" type="selectionEntry"/>
+        <entryLink id="0e4a-55f9-485c-e9aa" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="b338-59f9-6801-038a" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="460"/>
@@ -3523,161 +3453,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="12d1-10f4-521e-b853" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="set" field="6a76-7f88-355c-506c" 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="6a76-7f88-355c-506c" 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="6a76-7f88-355c-506c" value="-1">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74ec-9165-2793-0744" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="6a76-7f88-355c-506c" type="max"/>
-      </constraints>
-      <profiles>
-        <profile id="2ea2-6a8e-3ae6-aaaa" name="Tresher - Pungari Bombers" hidden="false" typeId="f174-1347-6969-af9b" typeName="Load">
-          <characteristics>
-            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">4</characteristic>
-            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
-          </characteristics>
-        </profile>
-        <profile id="9022-9006-18dd-9a3e" name="Tresher - Pungari Bulk Landers" hidden="false" typeId="f174-1347-6969-af9b" typeName="Load">
-          <characteristics>
-            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">2</characteristic>
-            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
-          </characteristics>
-        </profile>
-        <profile id="30d9-b435-85b6-0d07" name="Tresher" publicationId="8d8e-bcaa-3d14-b6e2" 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">6&quot;</characteristic>
-            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">6&quot;</characteristic>
-            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">14</characteristic>
-            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">3+</characteristic>
-            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">4</characteristic>
-            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1</characteristic>
-            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
-            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Rare, Reinforced Armour</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="a47f-deda-d534-00a1" name="Tresher A - Boarding Torpedoes, Front" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">F</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="5c19-cc2c-edc1-7414" name="Tresher B - Boarding Torpedoes, Starboard" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="a609-1fd6-4c68-93e2" name="Tresher C - Boarding Torpedoes, Port" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked-1</characteristic>
-          </characteristics>
-        </profile>
-      </profiles>
-      <infoLinks>
-        <infoLink id="e903-8a0d-e72e-a4dd" name="Reinforced Armour" hidden="false" targetId="8560-b10d-f4cb-d837" type="rule"/>
-        <infoLink id="32c6-23c3-0081-2703" name="Corruptor" hidden="false" targetId="c334-0240-1cae-8db7" type="rule"/>
-        <infoLink id="3cc6-89f5-a5e7-99c5" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
-        <infoLink id="8cd8-e08c-3d95-17a6" name="Rare" hidden="false" targetId="becc-b3c9-c26c-abde" type="rule"/>
-      </infoLinks>
-      <categoryLinks>
-        <categoryLink id="bedb-c69d-7522-5de2" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="150"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="4"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="bb92-8002-0336-3faf" name="Flagship (M)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4ba8-8fd0-110c-3203" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="aa59-777d-09be-3b78" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="193e-4519-9376-b656" name="Flagship (H)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb2a-f664-3ac0-375d" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="fdfc-882b-8c38-1a1e" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="dfe5-022b-45b9-37bc" name="Flagship (S)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="07e1-f3e1-9afa-3423" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="134c-3208-9e20-c1f4" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="e58f-d444-d0f0-8fe1" name="Flagship (S2)" hidden="false" collective="false" import="true" type="upgrade">
-      <modifiers>
-        <modifier type="set" field="4e27-4a87-26ee-5ae7" value="1">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5ea2-6b2a-f3be-cfdf" type="greaterThan"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8096-7c03-7542-a491" type="greaterThan"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a135-e799-6fa2-3683" type="max"/>
-        <constraint field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="4e27-4a87-26ee-5ae7" type="min"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="047a-0bb1-1be3-6b7d" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="dcc2-ab1d-5355-247b" name="Agrippa Interference Cruiser" hidden="false" collective="false" import="true" type="model">
       <profiles>
         <profile id="8ade-0af7-2950-777c" name="Agrippa" publicationId="bb34-1413-pubN67767" page="171" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
@@ -3725,7 +3500,7 @@
         <categoryLink id="6387-bf35-5c50-3ec2" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="f0ac-0b6a-23c1-12e8" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="f0ac-0b6a-23c1-12e8" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="175"/>
@@ -3776,7 +3551,7 @@
         <categoryLink id="3cf0-04b0-6efd-d5ef" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="b861-6e64-55c9-02f4" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="b861-6e64-55c9-02f4" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="180"/>
@@ -3886,7 +3661,7 @@
         <infoLink id="8c67-9cc3-98cc-7632" name="Atmospheric" hidden="false" targetId="32d9-8628-d42c-4ddd" type="rule"/>
         <infoLink id="4d30-7534-2c04-0159" name="Outlier" hidden="false" targetId="0a60-4c58-5666-78ee" type="rule"/>
         <infoLink id="9bb8-da61-a6f5-bc50" name="Close Action (Beam)" hidden="false" targetId="b190-a6a9-c262-b6d0" type="rule"/>
-        <infoLink id="0fa2-d34d-6626-7da8" name="**EM Sabotage" hidden="false" targetId="0509-2ee2-9e75-a3f4" type="rule"/>
+        <infoLink id="0fa2-d34d-6626-7da8" name="EM Warfare Suite" hidden="false" targetId="0509-2ee2-9e75-a3f4" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="c7b8-4203-7ab7-a1ac" name="Light" hidden="false" targetId="627b-146d-b78d-af3c" primary="true"/>
@@ -4062,7 +3837,7 @@
         <categoryLink id="12cb-5302-e971-d6b6" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="fa8c-4cdb-b9f4-c465" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="193e-4519-9376-b656" type="selectionEntry"/>
+        <entryLink id="fa8c-4cdb-b9f4-c465" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="170"/>
@@ -4134,7 +3909,7 @@
         <entryLink id="ef2f-5ece-ca35-a86b" name="Achilles Heavy Cruiser" hidden="false" collective="false" import="true" targetId="c968-bac5-2d15-bdd9" type="selectionEntry"/>
         <entryLink id="3835-58c8-56db-559d" name="Bellerophon Heavy Cruiser" hidden="false" collective="false" import="true" targetId="e8b4-d12b-4924-432f" type="selectionEntry"/>
         <entryLink id="a844-6e4d-fd59-14b7" name="Centurion Grand Cruisers" hidden="false" collective="false" import="true" targetId="d968-4132-6ee0-f2fe" type="selectionEntry"/>
-        <entryLink id="8c28-79f2-54b9-e5d0" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="12d1-10f4-521e-b853" type="selectionEntry"/>
+        <entryLink id="8c28-79f2-54b9-e5d0" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="91db-c1d9-41b6-06f2" type="selectionEntry"/>
         <entryLink id="d3c5-a287-d18d-5e93" name="Agrippa Interference Cruiser" hidden="false" collective="false" import="true" targetId="dcc2-ab1d-5355-247b" type="selectionEntry"/>
         <entryLink id="b396-29b8-c8f7-c397" name="Pompeius Battlecruiser" hidden="false" collective="false" import="true" targetId="8da4-2001-875e-eadf" type="selectionEntry"/>
         <entryLink id="c223-3e19-d457-8c05" name="Sisyphus Heavy Cruiser" hidden="false" collective="false" import="true" targetId="fc69-660c-702c-b86d" type="selectionEntry"/>
@@ -4151,4 +3926,7 @@
       </entryLinks>
     </selectionEntryGroup>
   </sharedSelectionEntryGroups>
+  <catalogueLinks>
+    <catalogueLink type="catalogue" name="Multi-faction" id="8a09-4a31-f681-7db5" targetId="edb7-ec70-1989-b4b3"/>
+  </catalogueLinks>
 </catalogue>
diff --git a/Resistance - Weapons.cat b/Resistance - Weapons.cat
new file mode 100644
index 0000000..43e83c4
--- /dev/null
+++ b/Resistance - Weapons.cat	
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<catalogue library="true" id="ed7e-81bf-ed24-0dfb" name="Resistance - Weapons" gameSystemId="bb34-1413-3527-b957" gameSystemRevision="17" revision="1" authorUrl="https://github.com/BSData/dropfleet-commander/issues" authorName="John Kemp" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <sharedSelectionEntries>
+    <selectionEntry type="upgrade" import="false" name="XN-31 Pair" hidden="false" id="ffb3-86e8-f46f-31cb" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="d0d3-d0a3-50f4-3204" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="a273-56e2-9859-3737" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="XN-31 Mass Driver Turret Pair" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon" hidden="false" id="2c63-8941-df8e-fbaa">
+          <characteristics>
+            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">2+</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</characteristic>
+            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Fusillade (2)</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+      <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>
+      <comment>2+/2/1 F/S Fus(2)</comment>
+      <infoLinks>
+        <infoLink name="Fusillade (X)" id="e4a6-ca10-01c0-4bb0" hidden="false" targetId="657f-18a5-dde4-5342" type="rule"/>
+      </infoLinks>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="false" name="N-31 Starboard" hidden="false" id="da50-f025-3ebe-5e2f" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="cb02-a682-45e3-1ba3" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="ad93-23a3-5dd5-48e7" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="N-31 Hybrid Gun Battery (Starboard)" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon" hidden="false" id="4e4d-3398-381f-636b">
+          <characteristics>
+            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">4+</characteristic>
+            <characteristic name="Attacks" typeId="00d0-7374-e403-ad78">8</characteristic>
+            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
+            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
+            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Linked (1)</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+      <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>
+      <comment>4+/8/1 S(R) Lnk(1)</comment>
+      <infoLinks>
+        <infoLink name="Linked (X)" id="beac-d24c-eea1-b2b3" hidden="false" type="rule" targetId="08ea-9db1-110b-0150"/>
+      </infoLinks>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="false" name="N-31 Port" hidden="false" id="e44c-f2ed-607c-2feb" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="b7a3-daa0-9673-5e1c" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="b189-8273-bd72-5312" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="N-31 Hybrid Gun Battery (Port)" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon" hidden="false" id="da2f-c7e5-c757-79e4">
+          <characteristics>
+            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">4+</characteristic>
+            <characteristic name="Attacks" typeId="00d0-7374-e403-ad78">8</characteristic>
+            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
+            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
+            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Linked (1)</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+      <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>
+      <comment>4+/8/1 S(L) Lnk(1)</comment>
+      <infoLinks>
+        <infoLink name="Linked (X)" id="5330-0352-b55b-a669" hidden="false" type="rule" targetId="08ea-9db1-110b-0150"/>
+      </infoLinks>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="false" name="NC-3 Missiles" hidden="false" id="79ea-671f-2e64-5215" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="0d08-0a44-5779-5cad" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="2ebd-4cd3-56e4-47e1" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="NC-3 Missiles" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon" hidden="false" id="8693-69d0-96f7-d222">
+          <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>
+      <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>
+      <comment>4+/2/1 F/S/R CA</comment>
+      <infoLinks>
+        <infoLink name="Close Action" id="7967-1ddc-31c1-0767" hidden="false" type="rule" targetId="5816-87fd-bf61-2418"/>
+      </infoLinks>
+    </selectionEntry>
+  </sharedSelectionEntries>
+</catalogue>
diff --git a/Resistance.cat b/Resistance.cat
index a08bd30..1c15acf 100644
--- a/Resistance.cat
+++ b/Resistance.cat
@@ -851,7 +851,7 @@
       <infoLinks>
         <infoLink id="f835-4b33-06a4-58d1" name="Air-to-Air" hidden="false" targetId="c3e1-6bee-9e1e-8f27" type="rule"/>
         <infoLink id="d440-c664-8f9e-6c0e" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
-        <infoLink id="bf5f-5b63-ea70-3e0c" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+        <infoLink id="bf5f-5b63-ea70-3e0c" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
         <infoLink id="94ab-5497-acb5-f160" name="Atmospheric" hidden="false" targetId="32d9-8628-d42c-4ddd" type="rule"/>
         <infoLink id="2f6b-8e1e-3c7a-bce7" name="Outlier" hidden="false" targetId="0a60-4c58-5666-78ee" type="rule"/>
       </infoLinks>
@@ -1401,77 +1401,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="15"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="eb98-fa81-e16b-bde6" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" type="model">
-      <profiles>
-        <profile id="5358-3263-d8ec-fe5c" name="Centurion" publicationId="07fb-79fc-ad90-6f9e" page="210" 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">6&quot;</characteristic>
-            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">7&quot;</characteristic>
-            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">14</characteristic>
-            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">2+</characteristic>
-            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">3</characteristic>
-            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1-2</characteristic>
-            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
-            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Ablative Armour, Remnant</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="3fdb-714f-94e3-6c42" name="Centurion A - XN-31 Mass Driver Turret Pair" hidden="false" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon">
-          <characteristics>
-            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">2+</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</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Fusillade(2)</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="f574-dde7-29c7-c5e7" name="Centurion B - N-31 Hybrid Gun Battery" 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">6</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="66d4-ba15-3a4e-6a58" name="Centurion D - NC-3 Missiles" 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>
-        <profile id="d009-dccc-cbd6-4cde" name="Centurion C - N-31 Hybrid Gun Battery" 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">6</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Linked-1</characteristic>
-          </characteristics>
-        </profile>
-      </profiles>
-      <infoLinks>
-        <infoLink id="e2be-6347-d845-eb14" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
-        <infoLink id="99af-e166-7e53-0bfd" name="Fusillade (X)" hidden="false" targetId="657f-18a5-dde4-5342" type="rule"/>
-        <infoLink id="75b1-6a3e-123a-9606" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
-        <infoLink id="527c-ccbc-b463-6098" name="Ablative Armour" hidden="false" targetId="38d0-f9e6-a208-1f17" type="rule"/>
-        <infoLink id="8ee0-9526-5bcf-9851" name="Remnant" hidden="false" targetId="e492-e4de-0f19-fcf5" type="rule"/>
-      </infoLinks>
-      <categoryLinks>
-        <categoryLink id="5f45-4ff4-3b95-8f07" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
-      </categoryLinks>
-      <entryLinks>
-        <entryLink id="c031-cefd-a8c3-ca5b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
-      </entryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="135"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="6044-ac85-a548-2634" name="Centurion Grand Cruisers" hidden="false" collective="false" import="true" type="unit">
       <entryLinks>
         <entryLink id="d6e1-24aa-a083-97f0" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="eb98-fa81-e16b-bde6" type="selectionEntry">
@@ -3168,58 +3097,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="f413-1384-f5c6-44c1" name="Flagship (H)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="81a6-198d-a483-7b9c" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="963c-aef1-6735-d11c" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="7876-1198-be24-9d63" name="Flagship (M)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="be4e-7390-9fef-0fa9" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="a891-9448-afbd-0fea" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="5985-0d00-1fcc-b8be" name="Flagship (S)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6851-f07f-679d-5205" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="66dd-358d-8963-745d" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="b338-59f9-6801-038a" name="Flagship (S2)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8177-6908-c960-7c56" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="c805-85a1-aeed-bddb" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="e876-1c80-9b9c-92e1" name="Cruiser" hidden="false" collective="false" import="true" type="model">
       <profiles>
         <profile id="1bf6-fb29-bb8e-17f2" name="Cruiser - Bulk Landers &amp; Fire Ships" hidden="true" typeId="f174-1347-6969-af9b" typeName="Load">
@@ -6338,7 +6215,7 @@
             </profile>
           </profiles>
           <infoLinks>
-            <infoLink id="ba04-e0ca-3e3b-ec22" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+            <infoLink id="ba04-e0ca-3e3b-ec22" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
           </infoLinks>
         </infoGroup>
         <infoGroup id="56d9-7e89-22b4-24e1" name="NC-16 Missile Turret" hidden="true">
@@ -6564,7 +6441,7 @@
                 </profile>
               </profiles>
               <infoLinks>
-                <infoLink id="a520-0e0a-ca5b-7051" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+                <infoLink id="a520-0e0a-ca5b-7051" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
               </infoLinks>
             </infoGroup>
             <infoGroup id="56d1-e777-ce9e-62d8" name="NC-16 Missile Turret" hidden="true">
@@ -6817,7 +6694,7 @@
             </profile>
           </profiles>
           <infoLinks>
-            <infoLink id="ebef-26c0-d28d-e8ca" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+            <infoLink id="ebef-26c0-d28d-e8ca" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
           </infoLinks>
         </infoGroup>
         <infoGroup id="e194-e07b-e75f-af43" name="N-31 Hybrid Gun Turret 2" hidden="true">
@@ -7149,7 +7026,7 @@
                 </profile>
               </profiles>
               <infoLinks>
-                <infoLink id="d02a-ebdb-8a05-2473" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+                <infoLink id="d02a-ebdb-8a05-2473" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
               </infoLinks>
             </infoGroup>
             <infoGroup id="9ab6-d093-026e-af43" name="N-31 Hybrid Gun Turret 2" hidden="true">
@@ -7459,7 +7336,7 @@
             </profile>
           </profiles>
           <infoLinks>
-            <infoLink id="38be-b129-e1a0-2497" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+            <infoLink id="38be-b129-e1a0-2497" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
           </infoLinks>
         </infoGroup>
         <infoGroup id="ee2b-ec99-eaa1-e3dc" name="NC-16 Missile Turret" hidden="true">
@@ -7709,7 +7586,7 @@
                 </profile>
               </profiles>
               <infoLinks>
-                <infoLink id="3c23-6536-580b-0937" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+                <infoLink id="3c23-6536-580b-0937" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
               </infoLinks>
             </infoGroup>
             <infoGroup id="5fc8-6e5e-106b-e9f4" name="NC-16 Missile Turret" hidden="true">
@@ -11489,7 +11366,7 @@
       </profiles>
       <infoLinks>
         <infoLink id="76e7-a16a-a678-6eae" name="Outlier" hidden="false" targetId="0a60-4c58-5666-78ee" type="rule"/>
-        <infoLink id="b6c8-896d-e370-859d" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+        <infoLink id="b6c8-896d-e370-859d" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="184b-1bd2-ec9e-5cb7" name="Light" hidden="false" targetId="627b-146d-b78d-af3c" primary="true"/>
@@ -11681,7 +11558,7 @@
                 </profile>
               </profiles>
               <infoLinks>
-                <infoLink id="766e-ea48-16f9-44c0" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+                <infoLink id="766e-ea48-16f9-44c0" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
               </infoLinks>
             </infoGroup>
             <infoGroup id="b8dd-b02e-a152-415f" name="NC-16 Missile Turret" hidden="true">
@@ -11873,7 +11750,7 @@
             </profile>
           </profiles>
           <infoLinks>
-            <infoLink id="cff9-3a35-ae48-a903" name="Squadron-X" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
+            <infoLink id="cff9-3a35-ae48-a903" name="Squadron (X)" hidden="false" targetId="27bd-1d4f-7ca7-8d43" type="rule"/>
           </infoLinks>
         </infoGroup>
         <infoGroup id="3610-bf8a-45c4-8ae4" name="NC-16 Missile Turret" hidden="true">
@@ -12644,4 +12521,7 @@ Also, because of another bug, not all profiles in battlegroups will be correctly
       <description>When this ship is destroyed, it suffers Catastrophic Damage as if it had Hull 6 (D3&quot;). Additionally, this ship does not count towards your fleet&apos;s Launch capacity.</description>
     </rule>
   </sharedRules>
+  <catalogueLinks>
+    <catalogueLink type="catalogue" name="Multi-faction" id="40b9-9e85-3070-24cc" targetId="edb7-ec70-1989-b4b3"/>
+  </catalogueLinks>
 </catalogue>
diff --git a/Scourge.cat b/Scourge.cat
index 74953f1..172db42 100644
--- a/Scourge.cat
+++ b/Scourge.cat
@@ -35,7 +35,7 @@
     <entryLink id="ae6d-8e57-addc-c8f2" name="Dreadnought Battlegroup" hidden="false" collective="false" import="true" targetId="c6ce-9f9b-392e-9a19" type="selectionEntry"/>
     <entryLink id="21b0-0108-ae6e-64b8" name="Shedu Monitor" hidden="false" collective="false" import="true" targetId="90ae-a279-2561-2bdf" type="selectionEntry"/>
     <entryLink id="1085-4371-f729-976d" name="Lamassu Barge" hidden="false" collective="false" import="true" targetId="42e1-cee4-875e-8d20" type="selectionEntry"/>
-    <entryLink id="3a5a-12e9-5e23-757b" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="fc21-fa93-eed6-2a7b" type="selectionEntry"/>
+    <entryLink id="3a5a-12e9-5e23-757b" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="91db-c1d9-41b6-06f2" type="selectionEntry"/>
     <entryLink id="286a-0e4f-6291-cb34" name="Parasite Radiation Leech" hidden="false" collective="false" import="true" targetId="e4c6-c8c2-cd38-80dd" type="selectionEntry"/>
     <entryLink id="a832-c944-9005-dbdf" name="Hiruko Boarding Cutter" hidden="false" collective="false" import="true" targetId="7be2-34ad-09a6-7dd4" type="selectionEntry"/>
     <entryLink id="38b3-7888-ae73-6063" name="Hiruko Boarding Cutter" hidden="false" collective="false" import="true" targetId="7be2-34ad-09a6-7dd4" type="selectionEntry"/>
@@ -125,7 +125,7 @@
         <categoryLink id="1384-2923-0f6e-494f" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="4e34-b128-21d4-2271" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="2d36-6578-54f3-a789" type="selectionEntry"/>
+        <entryLink id="4e34-b128-21d4-2271" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="260"/>
@@ -217,7 +217,7 @@
         <categoryLink id="cc34-174d-3dfa-39ac" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="4263-76a0-ee1e-2e54" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="2d36-6578-54f3-a789" type="selectionEntry"/>
+        <entryLink id="4263-76a0-ee1e-2e54" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="265"/>
@@ -279,7 +279,7 @@
       </profiles>
       <infoLinks>
         <infoLink id="b315-e93e-d751-becf" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
-        <infoLink id="c1f5-a6ec-1c14-f773" name="Full-Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
+        <infoLink id="c1f5-a6ec-1c14-f773" name="Full Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
         <infoLink id="333f-7416-4c04-2021" name="Scald" hidden="false" targetId="c7fa-b054-49d7-e9d5" type="rule"/>
         <infoLink id="a392-d1e6-cb07-c4d8" name="Stealth" hidden="false" targetId="8670-fbd9-e48c-da59" type="rule"/>
       </infoLinks>
@@ -287,7 +287,7 @@
         <categoryLink id="125b-676e-df77-d5e7" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="98dc-279d-d739-8f20" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="98dc-279d-d739-8f20" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="215"/>
@@ -348,7 +348,7 @@
         </profile>
       </profiles>
       <infoLinks>
-        <infoLink id="9347-058e-1529-77b1" name="Full-Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
+        <infoLink id="9347-058e-1529-77b1" name="Full Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
         <infoLink id="1c2d-e61a-20f1-eebc" name="Stealth" hidden="false" targetId="8670-fbd9-e48c-da59" type="rule"/>
         <infoLink id="b0bc-cd9f-310f-8d93" name="Scald" hidden="false" targetId="c7fa-b054-49d7-e9d5" type="rule"/>
         <infoLink id="fe89-6e36-c92f-f00f" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
@@ -357,7 +357,7 @@
         <categoryLink id="8311-c2a7-14a6-d7b8" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="8cfb-e963-bc2b-30f0" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="8cfb-e963-bc2b-30f0" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="215"/>
@@ -407,7 +407,7 @@
       </profiles>
       <infoLinks>
         <infoLink id="4160-27ee-1ac4-4480" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
-        <infoLink id="d761-c316-2c4c-bda2" name="Full-Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
+        <infoLink id="d761-c316-2c4c-bda2" name="Full Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
         <infoLink id="03ed-9db8-01ba-f3fb" name="Launch" hidden="false" targetId="6af7-681c-b2c8-5acc" type="rule"/>
         <infoLink id="4f6d-fb24-e2f9-a728" name="Scald" hidden="false" targetId="c7fa-b054-49d7-e9d5" type="rule"/>
         <infoLink id="231d-b6f7-7942-c837" name="Stealth" hidden="false" targetId="8670-fbd9-e48c-da59" type="rule"/>
@@ -418,7 +418,7 @@
         <categoryLink id="df29-b98b-cf79-b768" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="7fef-dc11-bd91-2643" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="7fef-dc11-bd91-2643" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="180"/>
@@ -467,7 +467,7 @@
         </profile>
       </profiles>
       <infoLinks>
-        <infoLink id="7ad2-bf21-8562-8a86" name="Full-Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
+        <infoLink id="7ad2-bf21-8562-8a86" name="Full Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
         <infoLink id="6649-bff5-4859-f990" name="Stealth" hidden="false" targetId="8670-fbd9-e48c-da59" type="rule"/>
         <infoLink id="f8cf-e535-d04e-5386" name="Launch" hidden="false" targetId="6af7-681c-b2c8-5acc" type="rule"/>
         <infoLink id="696b-4dd6-3ae7-10eb" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
@@ -479,7 +479,7 @@
         <categoryLink id="4aaa-e3e0-313b-5984" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="5ae6-fc35-990f-651b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="5ae6-fc35-990f-651b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="180"/>
@@ -549,7 +549,7 @@
         <categoryLink id="a93b-eba4-2ecc-63fa" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="0eb3-7118-3502-b440" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="0eb3-7118-3502-b440" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="160"/>
@@ -622,7 +622,7 @@
         <categoryLink id="ac55-df44-d82d-a555" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="278a-61bc-3e42-7bff" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="278a-61bc-3e42-7bff" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="150"/>
@@ -690,7 +690,7 @@
         <categoryLink id="2b95-ab6d-d865-b53f" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="ca3d-a52c-50ee-d159" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="86ee-b55d-eee9-5ed6" type="selectionEntry"/>
+        <entryLink id="ca3d-a52c-50ee-d159" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="115"/>
@@ -740,7 +740,7 @@
         <categoryLink id="e5b9-d048-3657-becc" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="0380-e4f2-98ba-f306" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="86ee-b55d-eee9-5ed6" type="selectionEntry"/>
+        <entryLink id="0380-e4f2-98ba-f306" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="105"/>
@@ -811,7 +811,7 @@
         <categoryLink id="3d0b-f7d5-9a13-94b7" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="827e-66bc-1c85-a0a3" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="86ee-b55d-eee9-5ed6" type="selectionEntry"/>
+        <entryLink id="827e-66bc-1c85-a0a3" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="110"/>
@@ -868,7 +868,7 @@
         <categoryLink id="5bc8-fa58-c1ac-4481" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="8dde-57a0-a8e8-72e3" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="86ee-b55d-eee9-5ed6" type="selectionEntry"/>
+        <entryLink id="8dde-57a0-a8e8-72e3" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="140"/>
@@ -925,7 +925,7 @@
         <categoryLink id="2d75-8fbb-615a-79b9" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="7c16-5157-7c46-112a" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="86ee-b55d-eee9-5ed6" type="selectionEntry"/>
+        <entryLink id="7c16-5157-7c46-112a" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="105"/>
@@ -975,7 +975,7 @@
         <categoryLink id="5cc3-e919-b021-7500" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="7c3b-0ce4-e4d0-c68f" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="86ee-b55d-eee9-5ed6" type="selectionEntry"/>
+        <entryLink id="7c3b-0ce4-e4d0-c68f" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="90"/>
@@ -1043,7 +1043,7 @@
         <categoryLink id="f26d-4026-6397-b345" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="56b5-961f-8c5c-2c50" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="86ee-b55d-eee9-5ed6" type="selectionEntry"/>
+        <entryLink id="56b5-961f-8c5c-2c50" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="95"/>
@@ -1195,7 +1195,7 @@
         <infoLink id="135d-eb1d-06aa-24cf" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
         <infoLink id="96b5-bfa5-9955-33c9" name="Scald" hidden="false" targetId="c7fa-b054-49d7-e9d5" type="rule"/>
         <infoLink id="171e-9de0-d86d-403f" name="Bombardment" hidden="false" targetId="9e06-f148-f8a3-26fb" type="rule"/>
-        <infoLink id="a6b4-a902-19a7-77eb" name="**Low Level" hidden="false" targetId="6d0f-db40-ebb6-7a1f" type="rule"/>
+        <infoLink id="a6b4-a902-19a7-77eb" name="Low Level" hidden="false" targetId="6d0f-db40-ebb6-7a1f" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9577-1ad2-48db-4410" name="Light" hidden="false" targetId="627b-146d-b78d-af3c" primary="true"/>
@@ -1858,9 +1858,9 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="69c3-0f33-30db-cea3" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2d36-6578-54f3-a789" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="248c-f74f-d809-c3af" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1880,15 +1880,15 @@
               <modifiers>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="20">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="69c3-0f33-30db-cea3" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="0">
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2d36-6578-54f3-a789" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="248c-f74f-d809-c3af" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1910,15 +1910,15 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2d36-6578-54f3-a789" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="248c-f74f-d809-c3af" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="69c3-0f33-30db-cea3" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -1941,15 +1941,15 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="80">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="69c3-0f33-30db-cea3" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2d36-6578-54f3-a789" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="248c-f74f-d809-c3af" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -1974,15 +1974,15 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="100">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="69c3-0f33-30db-cea3" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="80">
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2d36-6578-54f3-a789" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="248c-f74f-d809-c3af" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -2849,7 +2849,7 @@
       <infoLinks>
         <infoLink id="2bf2-bc35-03df-1c65" name="Dreadnought" hidden="false" targetId="c77c-14da-96fe-32ac" type="rule"/>
         <infoLink id="0fdc-966e-763c-8df4" name="Launch" hidden="false" targetId="6af7-681c-b2c8-5acc" type="rule"/>
-        <infoLink id="04f9-d5fe-611b-c487" name="Full-Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
+        <infoLink id="04f9-d5fe-611b-c487" name="Full Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
         <infoLink id="2ff8-b67d-a0c0-ccb9" name="Stealth" hidden="false" targetId="8670-fbd9-e48c-da59" type="rule"/>
         <infoLink id="d4c1-1aef-066e-3416" name="Scald" hidden="false" targetId="c7fa-b054-49d7-e9d5" type="rule"/>
         <infoLink id="6076-5707-993d-e575" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
@@ -2859,7 +2859,7 @@
         <categoryLink id="be79-aafd-651a-8f7e" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="2c10-0444-8ab8-9ce4" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="248c-f74f-d809-c3af" type="selectionEntry"/>
+        <entryLink id="2c10-0444-8ab8-9ce4" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="b338-59f9-6801-038a" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="460"/>
@@ -2946,7 +2946,7 @@
       <infoLinks>
         <infoLink id="75a5-6620-be12-d7aa" name="Dreadnought" hidden="false" targetId="c77c-14da-96fe-32ac" type="rule"/>
         <infoLink id="64af-5c13-3f6a-3bf1" name="Launch" hidden="false" targetId="6af7-681c-b2c8-5acc" type="rule"/>
-        <infoLink id="8eda-e894-1571-a7bf" name="Full-Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
+        <infoLink id="8eda-e894-1571-a7bf" name="Full Cloak" hidden="false" targetId="7429-7752-92a3-2a9c" type="rule"/>
         <infoLink id="2069-194a-a4cd-6ea7" name="Stealth" hidden="false" targetId="8670-fbd9-e48c-da59" type="rule"/>
         <infoLink id="eb4e-ca4d-c891-6a0b" name="Scald" hidden="false" targetId="c7fa-b054-49d7-e9d5" type="rule"/>
         <infoLink id="a6a8-b1e5-aa8e-ef2d" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
@@ -2958,7 +2958,7 @@
         <categoryLink id="d677-d687-409f-dd79" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="8c93-fa8b-53ea-18a6" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="248c-f74f-d809-c3af" type="selectionEntry"/>
+        <entryLink id="8c93-fa8b-53ea-18a6" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="b338-59f9-6801-038a" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="470"/>
@@ -3132,166 +3132,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="fc21-fa93-eed6-2a7b" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="set" field="a8f1-6ee0-b479-3bf6" 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="a8f1-6ee0-b479-3bf6" 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="a8f1-6ee0-b479-3bf6" value="-1">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74ec-9165-2793-0744" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="a8f1-6ee0-b479-3bf6" type="max"/>
-      </constraints>
-      <profiles>
-        <profile id="9a3f-ad40-1ab6-ee68" name="Thresher - Pungari Bombers" hidden="false" typeId="f174-1347-6969-af9b" typeName="Load">
-          <characteristics>
-            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">4</characteristic>
-            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
-          </characteristics>
-        </profile>
-        <profile id="0cec-2345-4c24-3d80" name="Thresher - Pungari Bulk Landers" hidden="false" typeId="f174-1347-6969-af9b" typeName="Load">
-          <characteristics>
-            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">2</characteristic>
-            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
-          </characteristics>
-        </profile>
-        <profile id="4dcc-acf8-c0fc-4e0b" name="Thresher" publicationId="8d8e-bcaa-3d14-b6e2" 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">6&quot;</characteristic>
-            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">6&quot;</characteristic>
-            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">14</characteristic>
-            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">3+</characteristic>
-            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">4</characteristic>
-            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1</characteristic>
-            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
-            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Rare, Reinforced Armour</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="6653-7369-e74d-ab8b" name="Thresher A - Boarding Torpedoes, Front" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">F</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="dbd5-e8e0-08eb-588e" name="Thresher B - Boarding Torpedoes, Starboard" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="b092-a734-056a-496a" name="Thresher C - Boarding Torpedoes, Port" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked-1</characteristic>
-          </characteristics>
-        </profile>
-      </profiles>
-      <rules>
-        <rule id="cc3d-6f52-eeb8-3726" name="Pungari Landers" hidden="false">
-          <description>Pungari Bulk Landers only drop Infantry Assets.</description>
-        </rule>
-      </rules>
-      <infoLinks>
-        <infoLink id="fd7d-34d8-7091-bf88" name="Reinforced Armour" hidden="false" targetId="8560-b10d-f4cb-d837" type="rule"/>
-        <infoLink id="f365-9f18-995d-7d3d" name="Corruptor" hidden="false" targetId="c334-0240-1cae-8db7" type="rule"/>
-        <infoLink id="5666-d278-6116-c79f" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
-        <infoLink id="96d7-4158-37b7-d2f5" name="Rare" hidden="false" targetId="becc-b3c9-c26c-abde" type="rule"/>
-      </infoLinks>
-      <categoryLinks>
-        <categoryLink id="4c72-cb2a-08f2-47c1" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="150"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="4"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="69c3-0f33-30db-cea3" name="Flagship (H)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9a53-abd8-c120-1bee" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="d183-2b7e-4284-7017" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="86ee-b55d-eee9-5ed6" name="Flagship (M)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="314b-37d6-3ae8-1c02" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="da64-119e-8bdd-b7c3" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="2d36-6578-54f3-a789" name="Flagship (S)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0301-8d39-e4d6-a5bf" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="87d7-c2d0-2d7d-137b" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="248c-f74f-d809-c3af" name="Flagship (S2)" hidden="false" collective="false" import="true" type="upgrade">
-      <modifiers>
-        <modifier type="set" field="983a-fb61-2d0c-9175" value="1">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4f87-c199-ef63-6f5e" type="greaterThan"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="eff6-b724-b690-7415" type="greaterThan"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3cb6-20a7-11ba-b8a7" type="max"/>
-        <constraint field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="983a-fb61-2d0c-9175" type="min"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="b264-4e04-a566-7f33" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="31ee-da6c-8d1a-0f5f" name="Umbra Battlecruiser" hidden="false" collective="false" import="true" type="model">
       <profiles>
         <profile id="69bd-08c5-2566-8116" name="Umbra" publicationId="bb34-1413-pubN67767" page="139" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
@@ -3346,7 +3186,7 @@
         <categoryLink id="3743-b9c0-eff2-6239" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="950b-22aa-ff60-a77b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="950b-22aa-ff60-a77b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="195"/>
@@ -3414,7 +3254,7 @@
         <categoryLink id="b245-53ed-9685-ac4a" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="5f21-7e47-a2c9-74fe" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="5f21-7e47-a2c9-74fe" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="195"/>
@@ -3712,7 +3552,7 @@ This group may gain both benefits of this rule in its activation, but may only g
         <categoryLink id="7859-ab1b-e0ec-9ab7" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="90d0-1ec3-020d-b14b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="69c3-0f33-30db-cea3" type="selectionEntry"/>
+        <entryLink id="90d0-1ec3-020d-b14b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="200"/>
@@ -3734,7 +3574,7 @@ This group may gain both benefits of this rule in its activation, but may only g
         <entryLink id="7245-ec81-0805-4f01" name="Manticore Battlecruiser" hidden="false" collective="false" import="true" targetId="b837-d37b-a199-fe4f" type="selectionEntry"/>
         <entryLink id="cd36-dcd0-fb45-2852" name="Raiju Heavy Cruiser" hidden="false" collective="false" import="true" targetId="ff3e-2a27-6bdc-0a74" type="selectionEntry"/>
         <entryLink id="d3c6-db54-e0d0-e66f" name="Shenlong Heavy Cruiser" hidden="false" collective="false" import="true" targetId="10d2-3e64-d28e-1b5c" type="selectionEntry"/>
-        <entryLink id="2905-6ec3-4073-c377" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="fc21-fa93-eed6-2a7b" type="selectionEntry"/>
+        <entryLink id="2905-6ec3-4073-c377" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="91db-c1d9-41b6-06f2" type="selectionEntry"/>
         <entryLink id="6b8f-2f32-7638-520f" name="Shadow Battlecruiser" hidden="false" collective="false" import="true" targetId="06c7-df51-eb6e-4b64" type="selectionEntry"/>
         <entryLink id="eb68-23e8-8a76-347d" name="Umbra Battlecruiser" hidden="false" collective="false" import="true" targetId="31ee-da6c-8d1a-0f5f" type="selectionEntry"/>
         <entryLink id="c636-d54f-0e31-413b" name="Kulshedra Vilestar Carrier" hidden="false" collective="false" import="true" targetId="f1e8-1811-03e1-b088" type="selectionEntry"/>
@@ -3798,4 +3638,7 @@ This group may gain both benefits of this rule in its activation, but may only g
       </entryLinks>
     </selectionEntryGroup>
   </sharedSelectionEntryGroups>
+  <catalogueLinks>
+    <catalogueLink type="catalogue" name="Multi-faction" id="eba1-e788-8c5d-4241" targetId="edb7-ec70-1989-b4b3"/>
+  </catalogueLinks>
 </catalogue>
diff --git a/Shaltari - Weapons.cat b/Shaltari - Weapons.cat
new file mode 100644
index 0000000..bfa24c3
--- /dev/null
+++ b/Shaltari - Weapons.cat	
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<catalogue library="true" id="ef31-352e-ede6-13ec" name="Shaltari - Weapons" gameSystemId="bb34-1413-3527-b957" gameSystemRevision="17" revision="1" authorUrl="https://github.com/BSData/dropfleet-commander/issues" authorName="John Kemp" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <sharedSelectionEntries>
+    <selectionEntry type="upgrade" import="false" name="Boarding Pods (F)" hidden="false" id="468b-b193-3553-172e" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="e997-3363-1e22-7802" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="0066-0f0b-4232-4005" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="Boarding Pods (Front)" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon" hidden="false" id="3bd8-d32f-39f6-0eb5">
+          <characteristics>
+            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">4+</characteristic>
+            <characteristic name="Attacks" typeId="00d0-7374-e403-ad78">4</characteristic>
+            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
+            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">F</characteristic>
+            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+      <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>
+      <comment>4+/4/1 F Corr</comment>
+      <infoLinks>
+        <infoLink name="Corruptor" id="68e3-60d5-636f-2145" hidden="false" type="rule" targetId="c334-0240-1cae-8db7"/>
+      </infoLinks>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="false" name="Boarding Pods (St)" hidden="false" id="4322-3e6b-1b0c-551c" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="30cd-fd55-dfba-602b" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3eb0-0f9d-0196-eb45" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="Boarding Pods (Starboard)" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon" hidden="false" id="ec8b-fd9f-855a-72c1">
+          <characteristics>
+            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">4+</characteristic>
+            <characteristic name="Attacks" typeId="00d0-7374-e403-ad78">4</characteristic>
+            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
+            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
+            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked (1)</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+      <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>
+      <comment>4+/4/1 S(R) Corr Lnk(1)</comment>
+      <infoLinks>
+        <infoLink name="Corruptor" id="01f1-3980-0eb9-7ca7" hidden="false" type="rule" targetId="c334-0240-1cae-8db7"/>
+        <infoLink name="Linked (X)" id="ad24-d023-db2e-b3bb" hidden="false" type="rule" targetId="08ea-9db1-110b-0150"/>
+      </infoLinks>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="false" name="Boarding Pods (Po)" hidden="false" id="4513-d78c-46ba-04b1" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="a2ef-11c8-2385-1698" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="2ce7-d02a-b556-5d07" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="Boarding Pods (Port)" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon" hidden="false" id="c06b-dc18-863d-775d">
+          <characteristics>
+            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">4+</characteristic>
+            <characteristic name="Attacks" typeId="00d0-7374-e403-ad78">4</characteristic>
+            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
+            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
+            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked (1)</characteristic>
+          </characteristics>
+        </profile>
+      </profiles>
+      <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>
+      <comment>4+/4/1 S(L) Corr Lnk(1)</comment>
+      <infoLinks>
+        <infoLink name="Corruptor" id="d8cb-85b1-87e9-1d5e" hidden="false" type="rule" targetId="c334-0240-1cae-8db7"/>
+        <infoLink name="Linked (X)" id="69a4-a9ee-3887-c4a7" hidden="false" type="rule" targetId="08ea-9db1-110b-0150"/>
+      </infoLinks>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="false" name="Pungari Bulk Landers" hidden="false" id="1b65-a31c-47e5-52cf" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="400a-5db8-5d46-b1e7" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="272f-937a-54b7-e7a0" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="Pungari Bulk Landers" typeId="f174-1347-6969-af9b" typeName="Load" hidden="false" id="c201-2148-93b6-5daf">
+          <characteristics>
+            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">2</characteristic>
+            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
+          </characteristics>
+        </profile>
+      </profiles>
+      <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>
+      <comment>2</comment>
+      <infoLinks>
+        <infoLink name="Launch" id="0bf7-c7e0-f311-f5f8" hidden="false" type="rule" targetId="6af7-681c-b2c8-5acc"/>
+      </infoLinks>
+    </selectionEntry>
+    <selectionEntry type="upgrade" import="false" name="Pungari Bombers" hidden="false" id="a2a5-6ba2-bb76-6f21" defaultAmount="1" collective="true">
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="527a-04ac-aba2-a000" includeChildSelections="false"/>
+        <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="0cdd-0eda-fcfe-42dd" includeChildSelections="false"/>
+      </constraints>
+      <profiles>
+        <profile name="Pungari Bombers" typeId="f174-1347-6969-af9b" typeName="Load" hidden="false" id="1c98-0f62-0c89-cb7b">
+          <characteristics>
+            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">4</characteristic>
+            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
+          </characteristics>
+        </profile>
+      </profiles>
+      <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>
+      <comment>4</comment>
+      <infoLinks>
+        <infoLink name="Launch" id="2f37-7237-c950-9967" hidden="false" type="rule" targetId="6af7-681c-b2c8-5acc"/>
+      </infoLinks>
+    </selectionEntry>
+  </sharedSelectionEntries>
+</catalogue>
diff --git a/Shaltari Tribes.cat b/Shaltari Tribes.cat
index 14fd8e6..b65e52e 100644
--- a/Shaltari Tribes.cat	
+++ b/Shaltari Tribes.cat	
@@ -257,7 +257,7 @@
         <categoryLink id="4ca3-bfe6-aab8-58b8" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="dd21-b6bc-495e-d3c9" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="dd21-b6bc-495e-d3c9" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="200"/>
@@ -326,7 +326,7 @@
         <categoryLink id="9900-e9c7-3df9-c50c" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="3fdf-8076-b7bc-f0ad" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="3fdf-8076-b7bc-f0ad" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="200"/>
@@ -397,7 +397,7 @@
         <categoryLink id="719b-3e78-8e36-921b" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="6a5c-a9d1-f33b-781e" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="6a5c-a9d1-f33b-781e" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="185"/>
@@ -468,7 +468,7 @@
         <categoryLink id="1fdc-4cec-94b7-e396" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="0ac0-aa2d-3b02-d3dd" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="0ac0-aa2d-3b02-d3dd" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="175"/>
@@ -536,7 +536,7 @@
         <categoryLink id="38e2-a228-8c22-ce95" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="d7e0-8982-db63-d890" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="d7e0-8982-db63-d890" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="165"/>
@@ -606,7 +606,7 @@
         <categoryLink id="a027-4e95-9965-a827" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="076b-db58-0cbc-6c37" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="076b-db58-0cbc-6c37" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="140"/>
@@ -676,7 +676,7 @@
         <categoryLink id="95a3-c8c0-3377-f59b" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="ecb9-e672-c63b-5374" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="ecb9-e672-c63b-5374" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="165"/>
@@ -734,7 +734,7 @@
         <categoryLink id="8d5a-3006-c4ff-127e" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="2478-b512-555c-6754" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="92d2-5b28-3dc1-5d3c" type="selectionEntry"/>
+        <entryLink id="2478-b512-555c-6754" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="110"/>
@@ -794,7 +794,7 @@
         <categoryLink id="4e0e-0645-d0b8-abac" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="19dd-6d3a-f048-9051" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="92d2-5b28-3dc1-5d3c" type="selectionEntry"/>
+        <entryLink id="19dd-6d3a-f048-9051" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="100"/>
@@ -855,7 +855,7 @@
         <categoryLink id="306f-5e40-3949-12e4" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="5fa2-f72c-3100-7632" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="92d2-5b28-3dc1-5d3c" type="selectionEntry"/>
+        <entryLink id="5fa2-f72c-3100-7632" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="115"/>
@@ -911,7 +911,7 @@
         <categoryLink id="5b5a-2550-c1be-2699" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="c9a2-4366-99c1-fe17" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="92d2-5b28-3dc1-5d3c" type="selectionEntry"/>
+        <entryLink id="c9a2-4366-99c1-fe17" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="140"/>
@@ -967,7 +967,7 @@
         <categoryLink id="1dd0-09f8-4cba-b83c" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="2f98-98c0-add9-004e" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="92d2-5b28-3dc1-5d3c" type="selectionEntry"/>
+        <entryLink id="2f98-98c0-add9-004e" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="100"/>
@@ -1017,7 +1017,7 @@
         <categoryLink id="ffe1-0bbe-301a-5203" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="75c2-691f-558a-c099" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="92d2-5b28-3dc1-5d3c" type="selectionEntry"/>
+        <entryLink id="75c2-691f-558a-c099" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="70"/>
@@ -1068,7 +1068,7 @@
         <categoryLink id="5c49-e8d7-5be6-0013" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="bd49-fe7b-af0e-d1d0" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="92d2-5b28-3dc1-5d3c" type="selectionEntry"/>
+        <entryLink id="bd49-fe7b-af0e-d1d0" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="70"/>
@@ -1849,7 +1849,7 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="20">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da75-4c08-33b2-b854" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -1877,7 +1877,7 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da75-4c08-33b2-b854" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -1900,7 +1900,7 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="80">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da75-4c08-33b2-b854" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
@@ -1933,7 +1933,7 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="100">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da75-4c08-33b2-b854" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="80">
@@ -1963,7 +1963,7 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da75-4c08-33b2-b854" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                         <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="45d8-f5cd-e0a7-8d8e" type="greaterThan"/>
                         <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6d96-7b42-a5eb-1b03" type="greaterThan"/>
                       </conditions>
@@ -2901,7 +2901,7 @@
       </profiles>
       <infoLinks>
         <infoLink id="7f38-dfed-1671-d3bf" name="Monitor" hidden="false" targetId="bc43-3371-9c92-dfb6" type="rule"/>
-        <infoLink id="b870-346b-1d54-489c" name="**Ion(X)" hidden="false" targetId="3ede-cc59-6bd6-c21e" type="rule"/>
+        <infoLink id="b870-346b-1d54-489c" name="Ion (X)" hidden="false" targetId="3ede-cc59-6bd6-c21e" type="rule"/>
         <infoLink id="5f63-f7a6-8307-e282" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -3011,122 +3011,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="91db-c1d9-41b6-06f2" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="set" field="7fce-c7be-f7fb-a7fe" 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="7fce-c7be-f7fb-a7fe" 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="7fce-c7be-f7fb-a7fe" value="-1">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74ec-9165-2793-0744" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="7fce-c7be-f7fb-a7fe" type="max"/>
-      </constraints>
-      <profiles>
-        <profile id="ac06-020b-7359-4d3c" name="Thresher - Pungari Bombers" hidden="false" typeId="f174-1347-6969-af9b" typeName="Load">
-          <characteristics>
-            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">4</characteristic>
-            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
-          </characteristics>
-        </profile>
-        <profile id="e3d0-8856-adb8-bc4c" name="Thresher - Pungari Bulk Landers" hidden="false" typeId="f174-1347-6969-af9b" typeName="Load">
-          <characteristics>
-            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">2</characteristic>
-            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
-          </characteristics>
-        </profile>
-        <profile id="82ac-a7b2-6ea1-103e" name="Thresher" publicationId="8d8e-bcaa-3d14-b6e2" 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">6&quot;</characteristic>
-            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">6&quot;</characteristic>
-            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">14</characteristic>
-            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">3+/6+</characteristic>
-            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">4</characteristic>
-            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1</characteristic>
-            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
-            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Rare, Reinforced Armour</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="e313-427c-7c83-0156" name="Thresher A - Boarding Torpedoes, Front" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">F</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="c530-6061-84b5-ab53" name="Thresher B - Boarding Torpedoes, Starboard" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="2c19-5f37-0655-1254" name="Thresher C - Boarding Torpedoes, Port" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked-1</characteristic>
-          </characteristics>
-        </profile>
-      </profiles>
-      <infoLinks>
-        <infoLink id="4163-3ab3-9d0c-b69d" name="Reinforced Armour" hidden="false" targetId="8560-b10d-f4cb-d837" type="rule"/>
-        <infoLink id="8c1a-7ae2-0734-8310" name="Corruptor" hidden="false" targetId="c334-0240-1cae-8db7" type="rule"/>
-        <infoLink id="cb53-db26-20bb-eea4" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
-        <infoLink id="e9e0-ebc1-a032-ffbd" name="Rare" hidden="false" targetId="becc-b3c9-c26c-abde" type="rule"/>
-      </infoLinks>
-      <categoryLinks>
-        <categoryLink id="28d3-4b15-a753-0e08" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="150"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="4"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="da75-4c08-33b2-b854" name="Flagship (H)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ec7e-ba6f-33f5-85a5" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="2dc9-2441-4acb-41f5" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="92d2-5b28-3dc1-5d3c" name="Flagship (M)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8206-f15a-92c7-f46d" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="1eba-8581-1fa2-bed4" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="45d8-f5cd-e0a7-8d8e" name="Flagship (S)" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="df75-e46c-46f0-074f" type="max"/>
@@ -3215,7 +3099,7 @@
         <categoryLink id="a7b8-22aa-cc5b-845e" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="dc87-b632-af2e-b8aa" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="dc87-b632-af2e-b8aa" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="200"/>
@@ -3266,7 +3150,7 @@
         <categoryLink id="25a8-acbe-456f-bc8c" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="f5c6-6fd2-2485-d709" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="f5c6-6fd2-2485-d709" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="255"/>
@@ -3383,7 +3267,7 @@
         <infoLink id="18d8-91d4-c1c6-acfe" name="Outlier" hidden="false" targetId="0a60-4c58-5666-78ee" type="rule"/>
         <infoLink id="61dd-5ad8-52d3-b377" name="Vectored" hidden="false" targetId="fbc4-2a68-7c00-d6f1" type="rule"/>
         <infoLink id="fa57-7a85-af01-c093" name="Close Action (Beam)" hidden="false" targetId="b190-a6a9-c262-b6d0" type="rule"/>
-        <infoLink id="8942-d270-7ccd-1a37" name="**Void Skip" hidden="false" targetId="2a57-b345-ab65-1da5" type="rule"/>
+        <infoLink id="8942-d270-7ccd-1a37" name="Void Skip" hidden="false" targetId="2a57-b345-ab65-1da5" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="e9fe-59fd-ec87-b0a0" name="Light" hidden="false" targetId="627b-146d-b78d-af3c" primary="true"/>
@@ -3554,7 +3438,7 @@
         <categoryLink id="9178-5e1f-8ffe-1089" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="3dfe-7c8f-38b1-6b2b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="da75-4c08-33b2-b854" type="selectionEntry"/>
+        <entryLink id="3dfe-7c8f-38b1-6b2b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="e888-2584-886f-7f2c" value="200"/>
@@ -3641,4 +3525,7 @@
       </entryLinks>
     </selectionEntryGroup>
   </sharedSelectionEntryGroups>
+  <catalogueLinks>
+    <catalogueLink type="catalogue" name="Multi-faction" id="7bff-243f-f28b-bcfc" targetId="edb7-ec70-1989-b4b3"/>
+  </catalogueLinks>
 </catalogue>
diff --git a/United Colonies of Mankind.cat b/United Colonies of Mankind.cat
index 43ef326..f9ced58 100644
--- a/United Colonies of Mankind.cat	
+++ b/United Colonies of Mankind.cat	
@@ -8,7 +8,7 @@
     <entryLink id="b01d-a541-c9f2-a1ec" name="Fleet" hidden="false" collective="false" import="true" targetId="5699-604a-8095-058b" type="selectionEntry"/>
     <entryLink id="3cee-d5e6-c6a6-29f8" name="Beijing Battleship" hidden="false" collective="false" import="true" targetId="7f6f-2e30-436f-b9de" type="selectionEntry"/>
     <entryLink id="6154-44cb-170b-a50f" name="Berlin Cruiser" hidden="false" collective="false" import="true" targetId="7bd8-f7d2-81e5-1411" type="selectionEntry"/>
-    <entryLink id="205c-0cf6-1501-efad" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="7601-902e-0df4-0c70" type="selectionEntry"/>
+    <entryLink id="205c-0cf6-1501-efad" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="eb98-fa81-e16b-bde6" type="selectionEntry"/>
     <entryLink id="083e-43d3-bfdb-3dc7" name="Jakarta Aegis Frigate" hidden="false" collective="false" import="true" targetId="6830-cbfc-20e6-4aec" type="selectionEntry"/>
     <entryLink id="5430-8c6a-db86-f9ef" name="Johannesburg Battlecruiser" hidden="false" collective="false" import="true" targetId="cdab-9b19-6876-8592" type="selectionEntry"/>
     <entryLink id="c667-cc8e-aab7-c8f0" name="Lima Frigate" hidden="false" collective="false" import="true" targetId="dba1-e056-6281-9562" type="selectionEntry"/>
@@ -35,7 +35,7 @@
     <entryLink id="856a-5e5e-a2ff-de19" name="Washington Supercarrier" hidden="false" collective="false" import="true" targetId="4020-c343-6517-ee2f" type="selectionEntry"/>
     <entryLink id="c96b-25d3-272f-b215" name="Istanbul Monitor" hidden="false" collective="false" import="true" targetId="4a56-a300-35cd-0e2f" type="selectionEntry"/>
     <entryLink id="d752-b300-2718-e12b" name="Vienna Escort Frigate" hidden="false" collective="false" import="true" targetId="8b61-e695-f012-dd95" type="selectionEntry"/>
-    <entryLink id="89aa-293e-0a57-2a3d" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="5f7d-6ce1-41a1-921f" type="selectionEntry"/>
+    <entryLink id="89aa-293e-0a57-2a3d" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="91db-c1d9-41b6-06f2" type="selectionEntry"/>
     <entryLink import="true" name="Delhi Battleship" hidden="false" id="9c89-a577-6694-a991" type="selectionEntry" targetId="d9ce-81e4-ffac-906e"/>
   </entryLinks>
   <sharedSelectionEntries>
@@ -64,7 +64,7 @@
         <categoryLink id="dcfd-8da4-deb1-5c82" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="0730-879b-81e6-055a" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="e98e-6f1f-f86a-6276" type="selectionEntry"/>
+        <entryLink id="0730-879b-81e6-055a" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="b338-59f9-6801-038a" type="selectionEntry"/>
         <entryLink import="true" name="UF-9000 Starboard" hidden="false" id="028b-37cf-e4f8-f61c" type="selectionEntry" targetId="f8e3-76b9-67d2-5b69" sortIndex="1"/>
         <entryLink import="true" name="UF-9000 Port" hidden="false" id="d69f-6433-415f-d6ab" type="selectionEntry" targetId="1d73-9791-29be-5099" sortIndex="2"/>
         <entryLink import="true" name="UF-6400s Dorsal" hidden="false" id="e952-d8e6-77dd-57ee" type="selectionEntry" targetId="55c2-eea8-9203-9e7d" sortIndex="3"/>
@@ -104,7 +104,7 @@
         <categoryLink id="db2f-5b06-9a22-20a2" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="5065-bf81-ae89-0072" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="e98e-6f1f-f86a-6276" type="selectionEntry"/>
+        <entryLink id="5065-bf81-ae89-0072" name="Flagship (S2)" hidden="false" collective="false" import="true" targetId="b338-59f9-6801-038a" type="selectionEntry"/>
         <entryLink import="true" name="UF-9000 Starboard" hidden="false" id="38ba-b194-3956-9116" type="selectionEntry" targetId="f8e3-76b9-67d2-5b69" sortIndex="1"/>
         <entryLink import="true" name="Fighters &amp; Bombers" hidden="false" id="9d85-4b36-d75d-8bc8" type="selectionEntry" targetId="128a-7ca7-f016-c265" sortIndex="7"/>
         <entryLink import="true" name="UF-9000 Port" hidden="false" id="4555-3d87-55b8-27f2" type="selectionEntry" targetId="1d73-9791-29be-5099" sortIndex="2"/>
@@ -139,7 +139,7 @@
         <categoryLink id="e50e-cc63-88a0-1b82" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="4f21-e00e-0476-be91" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="983e-133f-733a-28f6" type="selectionEntry"/>
+        <entryLink id="4f21-e00e-0476-be91" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
         <entryLink import="true" name="Python SH Laser" hidden="false" id="243a-e33a-d9f1-20f5" type="selectionEntry" targetId="dc27-f763-3416-e642" sortIndex="1"/>
         <entryLink import="true" name="UF-4200s Port" hidden="false" id="d2ea-b4f0-30c8-7a93" type="selectionEntry" targetId="2007-860e-719c-09e4" sortIndex="2"/>
         <entryLink import="true" name="UF-4200s Starboard" hidden="false" id="c6ca-713a-c446-b8c3" type="selectionEntry" targetId="da0c-62ea-e395-c09a" sortIndex="3"/>
@@ -172,7 +172,7 @@
         <categoryLink id="9ab0-ab98-12da-cc31" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="e904-ee8d-3c1b-5bd3" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="983e-133f-733a-28f6" type="selectionEntry"/>
+        <entryLink id="e904-ee8d-3c1b-5bd3" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200s Port" hidden="false" id="3fbc-f208-67ea-373f" type="selectionEntry" targetId="2007-860e-719c-09e4" sortIndex="1"/>
         <entryLink import="true" name="UF-4200s Starboard" hidden="false" id="b8a7-a407-70e4-86b3" type="selectionEntry" targetId="da0c-62ea-e395-c09a" sortIndex="2"/>
         <entryLink import="true" name="Shark Missiles" hidden="false" id="8804-1ab0-a34a-5584" type="selectionEntry" targetId="45e9-c67c-7c06-c84c" sortIndex="3"/>
@@ -205,7 +205,7 @@
         <categoryLink id="6a21-fe60-0c25-3324" name="Super Heavy" hidden="false" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="a0c5-bf88-e6cc-e04f" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="983e-133f-733a-28f6" type="selectionEntry"/>
+        <entryLink id="a0c5-bf88-e6cc-e04f" name="Flagship (S)" hidden="false" collective="false" import="true" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
         <entryLink import="true" name="Python SH Laser" hidden="false" id="a784-4b21-adb7-d80b" type="selectionEntry" targetId="dc27-f763-3416-e642" sortIndex="1"/>
         <entryLink import="true" name="UF-4200s Port" hidden="false" id="245f-b8ce-a2e8-4d14" type="selectionEntry" targetId="2007-860e-719c-09e4" sortIndex="2"/>
         <entryLink import="true" name="UF-4200s Starboard" hidden="false" id="0ec7-9ce5-5cb7-74d1" type="selectionEntry" targetId="da0c-62ea-e395-c09a" sortIndex="3"/>
@@ -244,7 +244,7 @@
         <categoryLink name="Super Heavy" hidden="false" id="59ae-3cb2-e4b5-ea4f" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink import="true" name="Flagship (S)" hidden="false" id="218f-7ac8-1a00-b6d9" collective="false" targetId="983e-133f-733a-28f6" type="selectionEntry"/>
+        <entryLink import="true" name="Flagship (S)" hidden="false" id="218f-7ac8-1a00-b6d9" collective="false" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200s Port" hidden="false" id="b099-eb95-29c4-cc0a" type="selectionEntry" targetId="2007-860e-719c-09e4" sortIndex="1"/>
         <entryLink import="true" name="UF-4200s Starboard" hidden="false" id="02a2-5b1e-5c55-809c" type="selectionEntry" targetId="da0c-62ea-e395-c09a" sortIndex="2"/>
         <entryLink import="true" name="UF-6400s" hidden="false" id="3369-ec40-f09c-1a11" type="selectionEntry" targetId="cded-9dfb-e373-b902" sortIndex="3"/>
@@ -277,7 +277,7 @@
         <categoryLink name="Super Heavy" hidden="false" id="825b-1c4b-9277-f997" targetId="a74f-2082-f5bf-33a5" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink import="true" name="Flagship (S)" hidden="false" id="1d89-7a0e-68b5-ba40" collective="false" targetId="983e-133f-733a-28f6" type="selectionEntry"/>
+        <entryLink import="true" name="Flagship (S)" hidden="false" id="1d89-7a0e-68b5-ba40" collective="false" targetId="5985-0d00-1fcc-b8be" type="selectionEntry"/>
         <entryLink import="true" name="UF-12000" hidden="false" id="5000-d37f-fcf6-f8d1" type="selectionEntry" targetId="f034-a745-8a86-485b" sortIndex="1"/>
         <entryLink import="true" name="UF-4200s Port" hidden="false" id="94a1-049d-23ac-3f3f" type="selectionEntry" targetId="2007-860e-719c-09e4" sortIndex="2"/>
         <entryLink import="true" name="UF-4200s Starboard" hidden="false" id="16a8-2fba-1ce1-52cf" type="selectionEntry" targetId="da0c-62ea-e395-c09a" sortIndex="3"/>
@@ -309,7 +309,7 @@
         <categoryLink id="e1a6-6777-a8b2-78fe" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="9158-df9c-f5f7-590a" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="5fa6-9b86-d5df-59d7" type="selectionEntry"/>
+        <entryLink id="9158-df9c-f5f7-590a" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="661c-8b84-f1ab-71e8" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="101a-cdec-6d03-21c5" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="2"/>
         <entryLink import="true" name="UF-6400" hidden="false" id="058d-58a1-b3fc-6c16" type="selectionEntry" targetId="f60a-3a13-80f9-a2c8" sortIndex="3"/>
@@ -343,7 +343,7 @@
         <categoryLink id="01fb-b592-8c98-5946" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="2ec4-7337-8e1c-fbc2" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="5fa6-9b86-d5df-59d7" type="selectionEntry"/>
+        <entryLink id="2ec4-7337-8e1c-fbc2" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
         <entryLink import="true" name="Viper SH Laser" hidden="false" id="4968-b5ee-8cfa-63aa" type="selectionEntry" targetId="2d5a-a909-0aa2-880e" sortIndex="1"/>
         <entryLink import="true" name="UF-4200s Port" hidden="false" id="1113-a8b5-51bc-c406" type="selectionEntry" targetId="42ba-2ec4-1f18-e8ce" sortIndex="2"/>
         <entryLink import="true" name="UF-4200s Starboard" hidden="false" id="17b7-a824-6f96-9652" type="selectionEntry" targetId="eb81-0206-2ab7-9a5d" sortIndex="3"/>
@@ -378,7 +378,7 @@
         <categoryLink id="9479-b31f-9173-1979" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="6edc-17fc-cd8a-eaa7" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="5fa6-9b86-d5df-59d7" type="selectionEntry"/>
+        <entryLink id="6edc-17fc-cd8a-eaa7" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="bee0-8939-db9e-17c3" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="63a9-f8ff-73f9-02f1" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="2"/>
         <entryLink import="true" name="Shark Missiles" hidden="false" id="cc8f-c5ed-443f-9020" type="selectionEntry" targetId="45e9-c67c-7c06-c84c" sortIndex="3"/>
@@ -427,7 +427,7 @@
         <categoryLink id="344e-304b-35d5-5795" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="c82a-7542-2f02-ccb5" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="5fa6-9b86-d5df-59d7" type="selectionEntry"/>
+        <entryLink id="c82a-7542-2f02-ccb5" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="12a8-b1e0-8b00-b98e" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="bc19-01e0-b94e-809d" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="2"/>
         <entryLink import="true" name="Shark Missiles" hidden="false" id="f930-c65e-6ef0-f9a7" type="selectionEntry" targetId="45e9-c67c-7c06-c84c" sortIndex="3"/>
@@ -464,7 +464,7 @@
         <entryLink import="true" name="UF-6400s" hidden="false" id="1f90-7032-6a50-0d91" type="selectionEntry" targetId="cded-9dfb-e373-b902" sortIndex="2"/>
         <entryLink import="true" name="Shark Missiles" hidden="false" id="1266-00f0-cefa-cb4f" type="selectionEntry" targetId="45e9-c67c-7c06-c84c" sortIndex="3"/>
         <entryLink import="true" name="Fighters &amp; Bombers" hidden="false" id="0651-1804-f84c-ef44" type="selectionEntry" targetId="45c2-3645-b3bd-2648" sortIndex="4"/>
-        <entryLink import="true" name="Flagship (H)" hidden="false" id="52ca-ecf5-585b-c8a9" collective="false" targetId="5fa6-9b86-d5df-59d7" type="selectionEntry"/>
+        <entryLink import="true" name="Flagship (H)" hidden="false" id="52ca-ecf5-585b-c8a9" collective="false" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
       </entryLinks>
       <categoryLinks>
         <categoryLink targetId="1342-a92d-424c-140a" id="e976-866d-9346-cfc2" primary="true" name="Heavy"/>
@@ -490,7 +490,7 @@
         <categoryLink id="2bc4-7085-2417-10e3" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="459d-cf45-ca12-749d" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="5fa6-9b86-d5df-59d7" type="selectionEntry"/>
+        <entryLink id="459d-cf45-ca12-749d" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="ca26-102b-3eb6-d462" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="06d2-7c7a-a1fd-5799" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="2"/>
         <entryLink import="true" name="UF-6400s" hidden="false" id="8ee6-09f5-4682-aaf8" type="selectionEntry" targetId="21c5-55a6-d824-4587" sortIndex="3"/>
@@ -526,7 +526,7 @@
         <categoryLink id="1600-f2ad-16b6-c8fa" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="713a-7866-cf66-c46b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="5fa6-9b86-d5df-59d7" type="selectionEntry"/>
+        <entryLink id="713a-7866-cf66-c46b" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="f413-1384-f5c6-44c1" type="selectionEntry"/>
         <entryLink import="true" name="Cobra H Laser Pair" hidden="false" id="5833-c186-c0c6-dbb1" type="selectionEntry" targetId="0835-f51c-d3a0-8888" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="b268-d03c-e798-0b03" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="2"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="9b2c-3707-7bc3-584e" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="3"/>
@@ -558,7 +558,7 @@
         <categoryLink id="7869-e5c6-f3c1-b96d" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="2064-7ccb-c71d-312c" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="8ceb-82fd-b528-acf6" type="selectionEntry"/>
+        <entryLink id="2064-7ccb-c71d-312c" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="155c-f39f-0c6b-4905" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="f41f-b120-6b21-1cc9" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="2"/>
         <entryLink import="true" name="UF-6400s" hidden="false" id="8542-5f04-e6c5-3bac" type="selectionEntry" targetId="bf82-04d9-8a0e-7266" sortIndex="3"/>
@@ -590,7 +590,7 @@
         <categoryLink id="8955-d079-1954-8e85" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="8171-5388-3378-1bd0" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="8ceb-82fd-b528-acf6" type="selectionEntry"/>
+        <entryLink id="8171-5388-3378-1bd0" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
         <entryLink import="true" name="Cobra H Laser" hidden="false" id="aa74-b8c9-dd94-2a43" type="selectionEntry" targetId="245d-9808-483a-d36c" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="4c2d-e15f-2d4f-705e" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="2"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="dfa7-2c02-0e5f-daa8" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="3"/>
@@ -622,7 +622,7 @@
         <categoryLink id="c54a-e6ce-5397-8f41" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="d44e-7d3a-fedd-792f" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="8ceb-82fd-b528-acf6" type="selectionEntry"/>
+        <entryLink id="d44e-7d3a-fedd-792f" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="561a-ce12-1c41-e233" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="a959-582b-c64d-2414" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="2"/>
         <entryLink import="true" name="B-8000" hidden="false" id="066d-9708-aa72-43ce" type="selectionEntry" targetId="18da-f374-06df-9958" sortIndex="3"/>
@@ -654,7 +654,7 @@
         <categoryLink id="9fee-fd32-c188-ceb4" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="dedc-ab05-dc7c-d71b" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="8ceb-82fd-b528-acf6" type="selectionEntry"/>
+        <entryLink id="dedc-ab05-dc7c-d71b" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
         <entryLink import="true" name="UF-6400s" hidden="false" id="a741-6f15-7272-e1d0" type="selectionEntry" targetId="cded-9dfb-e373-b902" sortIndex="1"/>
         <entryLink import="true" name="Shark Missiles" hidden="false" id="7a6d-d00a-fc61-eaf9" type="selectionEntry" targetId="45e9-c67c-7c06-c84c" sortIndex="2"/>
         <entryLink import="true" name="Fighters &amp; Bombers" hidden="false" id="96c4-53d4-b407-c84b" type="selectionEntry" targetId="45c2-3645-b3bd-2648" sortIndex="3"/>
@@ -685,7 +685,7 @@
         <categoryLink id="e875-9139-5a4f-cafa" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="ee52-403d-251a-8fe7" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="8ceb-82fd-b528-acf6" type="selectionEntry"/>
+        <entryLink id="ee52-403d-251a-8fe7" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
         <entryLink import="true" name="UF-6400s" hidden="false" id="44ba-950b-c34a-c060" type="selectionEntry" targetId="bf82-04d9-8a0e-7266" sortIndex="1"/>
         <entryLink import="true" name="Barracuda Missiles" hidden="false" id="c30e-077c-eb6e-827f" type="selectionEntry" targetId="3470-dc96-83a6-2aef" sortIndex="2"/>
       </entryLinks>
@@ -715,7 +715,7 @@
         <categoryLink id="82c4-eaac-5d1c-f370" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="9902-398a-5107-5621" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="8ceb-82fd-b528-acf6" type="selectionEntry"/>
+        <entryLink id="9902-398a-5107-5621" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
         <entryLink import="true" name="Cobra H Laser" hidden="false" id="a18e-1c35-6d68-23b1" type="selectionEntry" targetId="245d-9808-483a-d36c" sortIndex="1"/>
         <entryLink import="true" name="Barracuda Missiles" hidden="false" id="b093-3c67-2d8d-3e65" type="selectionEntry" targetId="3470-dc96-83a6-2aef" sortIndex="2"/>
       </entryLinks>
@@ -745,7 +745,7 @@
         <categoryLink id="6213-64be-2f30-7e1a" name="Medium" hidden="false" targetId="d45f-e753-7ba7-3084" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="f8ad-401f-fe73-2b47" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="8ceb-82fd-b528-acf6" type="selectionEntry"/>
+        <entryLink id="f8ad-401f-fe73-2b47" name="Flagship (M)" hidden="false" collective="false" import="true" targetId="7876-1198-be24-9d63" type="selectionEntry"/>
         <entryLink import="true" name="UF-4200 Port" hidden="false" id="0d3d-9fd3-4658-c78a" type="selectionEntry" targetId="85ef-c4b5-9eb2-0077" sortIndex="1"/>
         <entryLink import="true" name="UF-4200 Starboard" hidden="false" id="60e8-2157-5c24-3f52" type="selectionEntry" targetId="c1a5-fe4d-f9e3-4437" sortIndex="2"/>
         <entryLink import="true" name="Barracuda Missiles" hidden="false" id="4819-4b69-e755-5726" type="selectionEntry" targetId="3470-dc96-83a6-2aef" sortIndex="3"/>
@@ -938,7 +938,7 @@
     </selectionEntry>
     <selectionEntry id="4a56-a300-35cd-0e2f" name="Istanbul Monitor" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="33">
       <profiles>
-        <profile id="2f0a-0bdc-177c-4c71" name="Istanbul" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="2f0a-0bdc-177c-4c71" name="Istanbul" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">10&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">4&quot;</characteristic>
@@ -971,7 +971,7 @@
     </selectionEntry>
     <selectionEntry id="8b61-e695-f012-dd95" name="Vienna Escort Frigate" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="34">
       <profiles>
-        <profile id="f382-8481-398b-823c" name="Vienna" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="f382-8481-398b-823c" name="Vienna" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">4&quot;</characteristic>
@@ -1023,7 +1023,7 @@
         <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" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="cdd9-18f1-4398-1abe" name="Havana" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">4&quot;</characteristic>
@@ -1055,7 +1055,7 @@
     </selectionEntry>
     <selectionEntry id="a35f-4ac4-cd75-c4d3" name="Vancouver Escort Carrier" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="36">
       <profiles>
-        <profile id="c90c-b219-d255-e27b" name="Vancouver" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="c90c-b219-d255-e27b" name="Vancouver" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">4&quot;</characteristic>
@@ -1084,7 +1084,7 @@
     </selectionEntry>
     <selectionEntry id="de51-868f-f763-9053" name="Kyiv Heavy Destroyer" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="37">
       <profiles>
-        <profile id="3f7e-4d55-e535-8575" name="Kyiv" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="3f7e-4d55-e535-8575" name="Kyiv" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">4&quot;</characteristic>
@@ -1113,7 +1113,7 @@
     </selectionEntry>
     <selectionEntry id="6c07-3626-e42f-0e4b" name="Nuuk EM Harasser" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="38">
       <profiles>
-        <profile id="d4a2-30e3-3f87-477b" name="Nuuk" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="d4a2-30e3-3f87-477b" name="Nuuk" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">3&quot;</characteristic>
@@ -1145,7 +1145,7 @@
     </selectionEntry>
     <selectionEntry id="19bf-03d9-2414-7e9d" name="Reykjavik Cutter" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="39">
       <profiles>
-        <profile id="b334-7abd-af50-9831" name="Reykjavik" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="b334-7abd-af50-9831" name="Reykjavik" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">3&quot;</characteristic>
@@ -1177,7 +1177,7 @@
     </selectionEntry>
     <selectionEntry id="2358-a563-6d15-676c" name="Santiago Corvette" hidden="false" collective="false" import="true" type="model" publicationId="f185-0072-424b-ef19" page="40">
       <profiles>
-        <profile id="820c-89fc-9699-5df3" name="Santiago" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="820c-89fc-9699-5df3" name="Santiago" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">2&quot;</characteristic>
@@ -1229,7 +1229,7 @@
         <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" page="" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
+        <profile id="9bf9-d7c9-9e29-afea" name="Lysander" hidden="false" typeId="ecce-1380-e182-c89e" typeName="Ship">
           <characteristics>
             <characteristic name="Scan" typeId="a704-f2fa-371d-9dab">6&quot;</characteristic>
             <characteristic name="Sig" typeId="1402-313c-914d-f053">0&quot;</characteristic>
@@ -2163,9 +2163,9 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="983e-133f-733a-28f6" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e98e-6f1f-f86a-6276" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fa6-9b86-d5df-59d7" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -2187,15 +2187,15 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="983e-133f-733a-28f6" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e98e-6f1f-f86a-6276" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="20">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fa6-9b86-d5df-59d7" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -2215,15 +2215,15 @@
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="983e-133f-733a-28f6" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e98e-6f1f-f86a-6276" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fa6-9b86-d5df-59d7" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -2246,17 +2246,17 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="80">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fa6-9b86-d5df-59d7" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="983e-133f-733a-28f6" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="40">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e98e-6f1f-f86a-6276" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -2279,15 +2279,15 @@
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="100">
                   <conditions>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fa6-9b86-d5df-59d7" type="greaterThan"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f413-1384-f5c6-44c1" type="greaterThan"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="e888-2584-886f-7f2c" value="80">
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="983e-133f-733a-28f6" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e98e-6f1f-f86a-6276" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5985-0d00-1fcc-b8be" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b338-59f9-6801-038a" type="greaterThan"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -2323,97 +2323,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="7601-902e-0df4-0c70" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="set" field="606f-6793-3651-3ba7" 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="606f-6793-3651-3ba7" 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="606f-6793-3651-3ba7" value="-1">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74ec-9165-2793-0744" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="606f-6793-3651-3ba7" type="max"/>
-      </constraints>
-      <profiles>
-        <profile id="f113-45df-15eb-3536" name="Centurion UCM" publicationId="07fb-79fc-ad90-6f9e" page="210" 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">6&quot;</characteristic>
-            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">7&quot;</characteristic>
-            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">14</characteristic>
-            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">2+</characteristic>
-            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">3</characteristic>
-            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1-2</characteristic>
-            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
-            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Ablative Armour, Rare</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="2ec4-f6ea-0a05-635b" name="Centurion UCM A - XN-31 Mass Driver Turret Pair" hidden="false" typeId="1ddb-c7dc-57a9-b97f" typeName="Weapon">
-          <characteristics>
-            <characteristic name="Lock" typeId="b264-7fc5-348d-06c0">2+</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</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Fusillade(2)</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="2270-6ecc-9f9b-125f" name="Centurion UCM B - N-31 Hybrid Gun Battery, Starboard" 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">6</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="d230-2a3e-908a-998e" name="Centurion UCM C - N-31 Hybrid Gun Battery, Port" 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">6</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="0168-1c98-7fc6-9eb1" name="Centurion UCM D - NC-3 Missiles" 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="b8f9-9d24-6f10-7c79" name="Fusillade (X)" hidden="false" targetId="657f-18a5-dde4-5342" type="rule"/>
-        <infoLink id="0e6e-3702-4933-d243" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
-        <infoLink id="038e-51ec-d3d5-73df" name="Close Action" hidden="false" targetId="5816-87fd-bf61-2418" type="rule"/>
-        <infoLink id="512b-1c8f-9d9b-97eb" name="Rare" hidden="false" targetId="becc-b3c9-c26c-abde" type="rule"/>
-        <infoLink id="bb42-4197-f4db-4e6e" name="Ablative Armour" hidden="false" targetId="38d0-f9e6-a208-1f17" type="rule"/>
-      </infoLinks>
-      <categoryLinks>
-        <categoryLink id="9f0a-0965-1fee-893e" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
-      </categoryLinks>
-      <entryLinks>
-        <entryLink id="8b70-7a89-b7db-a17c" name="Flagship (H)" hidden="false" collective="false" import="true" targetId="5fa6-9b86-d5df-59d7" type="selectionEntry"/>
-      </entryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="135"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="0483-4ffa-7e63-bb82" name="Centurion Grand Cruisers" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
         <modifier type="set" field="99ef-5ef4-7b04-c75f" value="2">
@@ -2431,13 +2340,13 @@
         <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="99ef-5ef4-7b04-c75f" type="max"/>
       </constraints>
       <entryLinks>
-        <entryLink id="8859-d27f-768c-e1fd" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="7601-902e-0df4-0c70" type="selectionEntry">
+        <entryLink id="8859-d27f-768c-e1fd" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="eb98-fa81-e16b-bde6" type="selectionEntry">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b1f-fc31-9f2c-4c70" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="87e1-843f-4e35-cc4d" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="97b1-24de-0149-1ce7" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="7601-902e-0df4-0c70" type="selectionEntry">
+        <entryLink id="97b1-24de-0149-1ce7" name="Centurion Grand Cruiser" hidden="false" collective="false" import="true" targetId="eb98-fa81-e16b-bde6" type="selectionEntry">
           <constraints>
             <constraint field="selections" scope="parent" value="0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2751-15d0-18bf-375e" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fa37-2c3a-9c23-8dcb" type="max"/>
@@ -2628,161 +2537,6 @@
         <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="5f7d-6ce1-41a1-921f" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="set" field="37a3-99eb-d177-7685" 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="37a3-99eb-d177-7685" 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="37a3-99eb-d177-7685" value="-1">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74ec-9165-2793-0744" type="instanceOf"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="37a3-99eb-d177-7685" type="max"/>
-      </constraints>
-      <profiles>
-        <profile id="f0ff-cae5-23ba-142b" name="Tresher - Pungari Bombers" hidden="false" typeId="f174-1347-6969-af9b" typeName="Load">
-          <characteristics>
-            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">4</characteristic>
-            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
-          </characteristics>
-        </profile>
-        <profile id="7224-ce90-bfb9-67a8" name="Tresher - Pungari Bulk Landers" hidden="false" typeId="f174-1347-6969-af9b" typeName="Load">
-          <characteristics>
-            <characteristic name="Launch" typeId="604b-2e24-d426-bf71">2</characteristic>
-            <characteristic name="Special" typeId="0574-9897-4dc9-48e8"/>
-          </characteristics>
-        </profile>
-        <profile id="9443-141f-4f1d-f718" name="Tresher" publicationId="8d8e-bcaa-3d14-b6e2" 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">6&quot;</characteristic>
-            <characteristic name="Thrust" typeId="5033-56fa-1878-bbff">6&quot;</characteristic>
-            <characteristic name="Hull" typeId="6277-95e1-d5cd-6d06">14</characteristic>
-            <characteristic name="A" typeId="41bf-5c81-5b4b-0aec">3+</characteristic>
-            <characteristic name="PD" typeId="47c4-a3c6-1e57-306b">4</characteristic>
-            <characteristic name="G" typeId="7396-9d6c-953f-4c4b">1</characteristic>
-            <characteristic name="T" typeId="5c7d-d46b-9c5f-4ac3">H</characteristic>
-            <characteristic name="Special" typeId="4717-adad-0be5-3c60">Rare, Reinforced Armour</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="b672-a978-afed-287f" name="Tresher A - Boarding Torpedoes, Front" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">F</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="ee1c-e47a-fdbe-00bc" name="Tresher B - Boarding Torpedoes, Starboard" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(R)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked-1</characteristic>
-          </characteristics>
-        </profile>
-        <profile id="4e3e-b99d-6a8a-f51c" name="Tresher C - Boarding Torpedoes, Port" 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">4</characteristic>
-            <characteristic name="Damage" typeId="ae4d-c88d-138f-1fcf">1</characteristic>
-            <characteristic name="Arc" typeId="61a9-ead3-7b97-32ed">S(L)</characteristic>
-            <characteristic name="Special" typeId="008a-e561-1ceb-a0f1">Corruptor, Linked-1</characteristic>
-          </characteristics>
-        </profile>
-      </profiles>
-      <infoLinks>
-        <infoLink id="ad98-5526-4cd4-102f" name="Reinforced Armour" hidden="false" targetId="8560-b10d-f4cb-d837" type="rule"/>
-        <infoLink id="2bbd-5b71-7a95-6e79" name="Corruptor" hidden="false" targetId="c334-0240-1cae-8db7" type="rule"/>
-        <infoLink id="d606-3f23-dd5a-7aa1" name="Linked (X)" hidden="false" targetId="08ea-9db1-110b-0150" type="rule"/>
-        <infoLink id="3ab0-4587-a8bb-96c2" name="Rare" hidden="false" targetId="becc-b3c9-c26c-abde" type="rule"/>
-      </infoLinks>
-      <categoryLinks>
-        <categoryLink id="8b03-ba01-a090-811f" name="Heavy" hidden="false" targetId="1342-a92d-424c-140a" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="150"/>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="4"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="10"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="8ceb-82fd-b528-acf6" name="Flagship (M)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="be24-e51f-c9d0-49e6" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="165e-0a67-325d-d509" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="5fa6-9b86-d5df-59d7" name="Flagship (H)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eb60-e8c1-2720-17e5" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="8c59-97d6-a8ed-bbe5" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="983e-133f-733a-28f6" name="Flagship (S)" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4991-07ba-1228-d1a9" type="max"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="bfe6-8cb0-d563-cb64" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
-    <selectionEntry id="e98e-6f1f-f86a-6276" name="Flagship (S2)" hidden="false" collective="false" import="true" type="upgrade">
-      <modifiers>
-        <modifier type="set" field="ed4c-3c9b-2d26-78bd" value="1">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4020-c343-6517-ee2f" type="greaterThan"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8677-d079-42d4-09f6" type="greaterThan"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b432-fe49-c33d-cd41" type="max"/>
-        <constraint field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="ed4c-3c9b-2d26-78bd" type="min"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink id="001a-14e2-1df3-e1fd" name="Flagships" hidden="false" targetId="7907-82a3-5278-4f8b" primary="true"/>
-      </categoryLinks>
-      <costs>
-        <cost name="Launch" typeId="ac2f-9b71-e1c5-783a" value="0"/>
-        <cost name="SR" typeId="c0c3-cb79-19ac-1dbc" value="0"/>
-        <cost name="pts" typeId="e888-2584-886f-7f2c" value="0"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="d659-3fb5-a96f-9b95" name="Reykjavik Cutters" hidden="false" collective="false" import="true" type="unit">
       <entryLinks>
         <entryLink id="5a9b-637f-5a31-ed54" name="Reykjavik Cutter" hidden="false" collective="false" import="true" targetId="19bf-03d9-2414-7e9d" type="selectionEntry">
@@ -2914,7 +2668,7 @@
         <entryLink id="a323-a300-8ec9-8297" name="Moscow Heavy Cruiser" hidden="false" collective="false" import="true" targetId="5254-88e5-d3a3-67bf" type="selectionEntry"/>
         <entryLink id="7f4f-c1ca-ac04-88c9" name="St. Petersburg Heavy Cruiser" hidden="false" collective="false" import="true" targetId="0696-bd36-c854-a6ab" type="selectionEntry"/>
         <entryLink id="4efc-2e97-4f90-6fc0" name="Centurion Grand Cruisers" hidden="false" collective="false" import="true" targetId="0483-4ffa-7e63-bb82" type="selectionEntry"/>
-        <entryLink id="1cd8-2908-c35b-2827" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="5f7d-6ce1-41a1-921f" type="selectionEntry"/>
+        <entryLink id="1cd8-2908-c35b-2827" name="Pungari Thresher Hive Ship" hidden="false" collective="false" import="true" targetId="91db-c1d9-41b6-06f2" type="selectionEntry"/>
         <entryLink id="9b8a-029c-61d9-a68c" name="Venice Command Battlecruiser" hidden="false" collective="false" import="true" targetId="ef3c-342d-5472-e41c" type="selectionEntry"/>
         <entryLink id="139f-b811-6078-2652" name="Rome Battlecruiser" hidden="false" collective="false" import="true" targetId="ca19-fb38-805b-1309" type="selectionEntry"/>
         <entryLink id="fd26-0f80-eb30-3473" name="Burnaby Battlestar Carrier" hidden="false" collective="false" import="true" targetId="477a-d6ab-6ba0-5bb9" type="selectionEntry"/>
@@ -2946,5 +2700,6 @@
   </sharedSelectionEntryGroups>
   <catalogueLinks>
     <catalogueLink type="catalogue" name="United Colonies of Mankind - Weapons" id="87bb-49e5-0603-b322" targetId="cc73-3fe2-5b3f-d6d0"/>
+    <catalogueLink type="catalogue" name="Multi-faction" id="5db4-aadc-776c-60ae" targetId="edb7-ec70-1989-b4b3"/>
   </catalogueLinks>
 </catalogue>