diff --git a/Alliance.cat b/Alliance.cat
index 09a451b..a37bb19 100644
--- a/Alliance.cat
+++ b/Alliance.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="aab7-88e9-70f7-d7f1" name="Alliance v3.06" revision="21" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="aab7-88e9-70f7-d7f1" name="Alliance v3.06" revision="22" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <comment>Alliance ORBAT 3.06 (published 08/05/2024)</comment>
   <readme>Datafile history:
 0.03.00: Initial publication
@@ -1085,8 +1085,8 @@
         <categoryLink id="dc38-3eba-8047-ea11" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="975f-7c54-7a59-4ed2" name="Chasseur" hidden="false" collective="false" import="true" targetId="0a0d-8f93-a5ef-a7cd" type="selectionEntry"/>
-        <entryLink import="true" name="Attached Unit [French, Skimming]" hidden="false" id="a578-8e50-c548-a240" type="selectionEntryGroup" targetId="49f6-6196-b263-5c92"/>
+        <entryLink id="975f-7c54-7a59-4ed2" name="Chasseur" hidden="false" collective="false" import="true" targetId="0a0d-8f93-a5ef-a7cd" type="selectionEntry" sortIndex="2"/>
+        <entryLink import="true" name="Attached Unit [French, Skimming]" hidden="false" id="a578-8e50-c548-a240" type="selectionEntryGroup" targetId="49f6-6196-b263-5c92" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
@@ -2075,8 +2075,8 @@
         <categoryLink id="b56f-9ed4-5386-8480" name="French" hidden="false" targetId="9aab-6794-6d2b-c1a8" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="1d9f-a4ac-eb4a-bba3" name="Dieppe" hidden="false" collective="false" import="true" targetId="62ce-2a9b-5530-8d35" type="selectionEntry"/>
-        <entryLink import="true" name="Attached Unit [French, Skimming]" hidden="false" id="fb6d-973f-3c2a-ab3e" type="selectionEntryGroup" targetId="49f6-6196-b263-5c92"/>
+        <entryLink id="1d9f-a4ac-eb4a-bba3" name="Dieppe" hidden="false" collective="false" import="true" targetId="62ce-2a9b-5530-8d35" type="selectionEntry" sortIndex="2"/>
+        <entryLink import="true" name="Attached Unit [French, Skimming]" hidden="false" id="fb6d-973f-3c2a-ab3e" type="selectionEntryGroup" targetId="49f6-6196-b263-5c92" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
diff --git a/Commonwealth.cat b/Commonwealth.cat
index 388ef39..232812b 100644
--- a/Commonwealth.cat
+++ b/Commonwealth.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="6719-1f83-56dd-91fe" name="Commonwealth v3.05" revision="23" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue" publicationId="e265-8c7f-a4b2-a48e">
+<catalogue id="6719-1f83-56dd-91fe" name="Commonwealth v3.05" revision="24" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue" publicationId="e265-8c7f-a4b2-a48e">
   <comment>Commonwealth ORBAT 3.05 (published 25/04/2024)</comment>
   <readme>Review 1.02.01: correct Rurik and Oleg unit max size
 Review 1.03.00: add new unit and new profile from ORBAT 1.03, fixed Battlefleet bonus managment
@@ -54,7 +54,7 @@ Review 3.05.02: v23 (Orbat 3.05 25/04/2024 released 18/08/2024)</readme>
     <categoryEntry id="4b26-379b-0169-bd86" name="Sineus Class Full" hidden="false"/>
     <categoryEntry id="0520-dbe8-a308-0797" name="Moskva-Class" hidden="false"/>
     <categoryEntry id="f644-ec7f-be02-4eae" name="Boyar-Class" publicationId="e265-8c7f-a4b2-a48e" hidden="false"/>
-    <categoryEntry id="aeb5-114e-68cf-0e35" name="Alexeyev-Class" publicationId="e265-8c7f-a4b2-a48e" hidden="false"/>
+    <categoryEntry id="aeb5-114e-68cf-0e35" name="Alexayev-Class" publicationId="e265-8c7f-a4b2-a48e" hidden="false"/>
     <categoryEntry id="ea82-a2fd-0f1c-5260" name="Prezidium-Class" publicationId="e265-8c7f-a4b2-a48e" hidden="false"/>
     <categoryEntry id="0b25-f836-09a9-ecf2" name="Rikhter-Class" publicationId="e265-8c7f-a4b2-a48e" hidden="false"/>
     <categoryEntry id="4f12-aa2a-c712-3683" name="Khan-Class" publicationId="e265-8c7f-a4b2-a48e" hidden="false"/>
@@ -380,7 +380,7 @@ Review 3.05.02: v23 (Orbat 3.05 25/04/2024 released 18/08/2024)</readme>
         </categoryLink>
         <categoryLink id="e98d-8c33-057c-9c22" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="false">
           <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="6b6a-5cd9-2d05-35fb" type="max"/>
+            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="6b6a-5cd9-2d05-35fb" type="min"/>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="eee5-e89e-a158-994f" type="max"/>
           </constraints>
         </categoryLink>
@@ -2396,7 +2396,7 @@ Review 3.05.02: v23 (Orbat 3.05 25/04/2024 released 18/08/2024)</readme>
         <constraint type="max" value="1" field="selections" scope="roster" shared="false" id="4d58-4ca1-2fd3-e8a8" includeChildSelections="true" includeChildForces="true"/>
       </constraints>
     </selectionEntry>
-    <selectionEntry id="777b-9350-2361-35be" name="Alexeyev Ekranoplan Heavy Transport" hidden="true" collective="false" import="true" type="model">
+    <selectionEntry id="777b-9350-2361-35be" name="Alexayev Ekranoplan Heavy Transport" hidden="true" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
           <conditionGroups>
diff --git a/Crown.cat b/Crown.cat
index b0a999b..1e4cf01 100644
--- a/Crown.cat
+++ b/Crown.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="4724-2577-5b2d-0bfe" name="Crown v3.06a" revision="18" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="4724-2577-5b2d-0bfe" name="Crown v3.06a" revision="19" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <comment>Crown ORBAT 3.06a (published 22/07/2024)</comment>
   <readme>Review 1.02.a0: Initial release
 Review 1.02.a1: minor point correction
@@ -2716,7 +2716,7 @@ Review 3.06.a2: release of 3.06a Orbat (ORBAT 3.06a 2024-08-19)</readme>
                 <categoryLink id="23fe-f605-7ea8-e392" name="Escort Class" hidden="false" targetId="a8dc-2c16-e614-7894" primary="false"/>
               </categoryLinks>
               <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="8"/>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
               </costs>
             </entryLink>
           </entryLinks>
@@ -3252,7 +3252,7 @@ Review 3.06.a2: release of 3.06a Orbat (ORBAT 3.06a 2024-08-19)</readme>
                 <categoryLink id="20df-9dff-b779-3656" name="Escort Class" hidden="false" targetId="a8dc-2c16-e614-7894" primary="false"/>
               </categoryLinks>
               <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="8"/>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
               </costs>
             </entryLink>
           </entryLinks>
@@ -11782,7 +11782,7 @@ Review 3.06.a2: release of 3.06a Orbat (ORBAT 3.06a 2024-08-19)</readme>
     <profile id="e977-1226-3a79-1a0d" name="Excalibur" publicationId="dbca-8d57-b848-457e" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">1</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">10</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">9</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">8</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">5</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">12</characteristic>
diff --git a/Dystopian_Wars.gst b/Dystopian_Wars.gst
index af4c082..0a73820 100644
--- a/Dystopian_Wars.gst
+++ b/Dystopian_Wars.gst
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="1242-c30b-419f-8229" name="Dystopian Wars 3.0" revision="12" battleScribeVersion="2.03" authorName="Riccardo Sipone / Ruslan Zakirov" authorContact="siponeric@hotmail.com / ruslan.zakirov.2000@gmail.com" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
+<gameSystem id="1242-c30b-419f-8229" name="Dystopian Wars 3.0" revision="13" battleScribeVersion="2.03" authorName="Riccardo Sipone / Ruslan Zakirov" authorContact="siponeric@hotmail.com / ruslan.zakirov.2000@gmail.com" xmlns="http://www.battlescribe.net/schema/gameSystemSchema" type="gameSystem">
   <comment>The Dystopian Wars datafile are editied and mantained with Ruslan Zakirov, that with patience has start to managed all profile and debugging.</comment>
   <readme>Revision 1.01: added all ORBAT Publication
 Revision 1.02: managed correctlly Publication, corrected Command Reroll bonus
@@ -108,6 +108,8 @@ Revision 3.06.00: common categories for 3.06 Orbats</readme>
     <categoryEntry name="3rd" hidden="false" id="df04-304e-3eb9-52b"/>
     <categoryEntry name="4th" hidden="false" id="5650-1732-3d85-61a6"/>
     <categoryEntry id="9512-6963-5c9a-e15f" name="Crown" publicationId="dbca-8d57-b848-457e" hidden="false"/>
+    <categoryEntry name="Port Third" id="0c23-0110-ee82-8551" hidden="false"/>
+    <categoryEntry name="Starboard Third" id="cbe3-a4d6-4d7d-9a4c" hidden="false"/>
   </categoryEntries>
   <forceEntries>
     <forceEntry id="44e8-1fde-db6e-20f6" name="Battlefleet (generic don&apos;t use)" publicationId="7f09-e243-2307-78d0" hidden="true">
diff --git a/Enlightened.cat b/Enlightened.cat
index b0604aa..4bcb858 100644
--- a/Enlightened.cat
+++ b/Enlightened.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="50c4-91af-d01e-a4e1" name="Enlightened v3.06" revision="18" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue" publicationId="908d-6feb-2e9e-843b">
+<catalogue id="50c4-91af-d01e-a4e1" name="Enlightened v3.06" revision="19" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue" publicationId="908d-6feb-2e9e-843b">
   <comment>Enlightened ORBAT 3.06 (published 17/06/2024)</comment>
   <readme>Review 1.02.00: initial edition according to Enlightened ORBAT 1.02a
 Review 1.02.01: bux fixing and correct Physeter Ambush management
@@ -1610,7 +1610,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
     <selectionEntry type="unit" import="true" name="Aronnax Vermiforma Colossus Squadron" hidden="true" id="f874-ad5b-12e3-e2a9">
       <categoryLinks>
         <categoryLink name="Submerged Unit" hidden="false" id="71d2-3ffc-b7c3-aa12" targetId="df3f-7b38-7940-f11e" primary="true"/>
-        <categoryLink name="Aronnax-class" hidden="false" id="3f98-0aac-69c8-19fa" targetId="e7b7-c408-f86d-191f" primary="false"/>
+        <categoryLink name="Aronnax-Class" hidden="false" id="3f98-0aac-69c8-19fa" targetId="e7b7-c408-f86d-191f" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink import="true" name="Aronnax" hidden="false" id="599c-0c43-410b-e617" type="selectionEntry" targetId="eff9-533c-3ac4-ed27"/>
@@ -1710,7 +1710,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="19f1-1478-f646-831d" name="Descartes" hidden="false" targetId="d6ec-4157-6788-a1cc" type="profile"/>
         <infoLink id="5bc1-ebfc-da38-79b4" name="Heavy Firepower [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="2977-7d30-f562-ba5b" name="Mine Sweeper [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
-        <infoLink id="3c19-7a7b-a854-4862" name="Luminiferous Defences [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="3c19-7a7b-a854-4862" name="Luminiferous Defences [3.07]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="6b79-d3fc-ea53-9084" name="Mine Layer [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
         <infoLink id="da26-f80a-9c6f-787d" name="Cetacean Launch Tubes [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="4533-b977-669c-bdcc" type="rule"/>
         <infoLink id="696a-f07e-ad83-a323" name="Command Codes [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="422e-0279-5ff5-c279" type="rule"/>
@@ -2020,7 +2020,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="0a2d-1ef1-bb88-93d6" name="The Oedipus" hidden="false" targetId="af5f-ec3b-0703-b55f" type="profile"/>
         <infoLink id="f825-d624-f967-8455" name="Physeter Assault [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="16cf-2537-6b52-ba3a" type="rule"/>
         <infoLink id="3c42-082a-d456-2423" name="Agitation Harmoniser [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="53ad-7286-fd8e-bea9" type="rule"/>
-        <infoLink id="a83a-66a9-b3c6-c508" name="Luminiferous Defences [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="a83a-66a9-b3c6-c508" name="Luminiferous Defences [3.07]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="ff18-f51d-5200-359e" name="Turbo Encabulation Drive [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="f6f1-c5e3-d8a1-d235" name="Mine Layer [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
         <infoLink id="b102-9edd-065a-eda4" name="Mine Sweeper [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
@@ -2225,7 +2225,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="7e6d-76e3-effb-390f" name="Ulysses" hidden="false" targetId="5172-1c0c-7442-6119" type="profile"/>
         <infoLink id="d96c-ca46-9310-c90f" name="Anti-Air Specialist [3.07a]" hidden="false" targetId="7baa-3e4c-35ea-5614" type="rule"/>
         <infoLink id="e00f-c354-1368-bacc" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="d2ff-25e1-bd95-6472" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="d2ff-25e1-bd95-6472" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="778f-a4e6-a6f6-da3c" name="SRS Mine Clearance [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="dc6d-6420-4a11-5332" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="532c-9769-a62e-4f93" name="SRS Recon [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
@@ -2407,7 +2407,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="4a49-2838-cadd-2221" name="Stiletto" hidden="false" targetId="d729-1246-8b19-e95d" type="profile"/>
         <infoLink id="adc6-33d7-fb3d-ea2f" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
         <infoLink id="8e26-a046-07d4-ff6f" name="Full Steam Ahead [3.07a]" hidden="false" targetId="9111-7f5e-6eac-7cbe" type="rule"/>
-        <infoLink id="5445-62a2-0530-9f35" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="5445-62a2-0530-9f35" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="eb4a-188c-ce60-bf3f" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -2484,7 +2484,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="b480-f945-a506-da76" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="b480-f945-a506-da76" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
@@ -2504,7 +2504,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="5a0f-7672-9934-41bd" name="Wavelurker [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
         <infoLink id="a3d4-67f0-0834-e781" name="Lovelace" hidden="false" targetId="0234-9067-eab3-ddc5" type="profile"/>
         <infoLink id="0dd3-3962-a411-985e" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="1f63-1887-3e0b-3ed0" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="1f63-1887-3e0b-3ed0" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="38fa-701a-ef54-8831" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -2662,7 +2662,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="2d1b-65f9-7f94-0ebf" name="Antarctica" hidden="false" targetId="207d-74de-3ddf-a949" type="profile"/>
         <infoLink id="6c98-b2c6-dc87-7f3e" name="Cross the Beams [3.06]" hidden="false" targetId="ce83-fa57-1470-b52a" type="rule"/>
         <infoLink id="47df-7be9-0a6f-c377" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="b13c-6c75-6aff-9f00" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="b13c-6c75-6aff-9f00" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="9593-28ad-db70-39d1" name="Wavelurker [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -2864,7 +2864,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="7c0d-acb5-ef80-52ce" name="Chatelet" hidden="false" targetId="0cbe-3717-85fe-e791" type="profile"/>
         <infoLink id="f620-470e-cf9a-3f22" name="Maritime Patrol [3.07a]" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
         <infoLink id="536c-4740-af49-2f1a" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="dc34-0964-523a-e7b6" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="dc34-0964-523a-e7b6" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink name="SRS Recon [3.07a]" id="1630-32e4-7e81-3b2" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="726a-4927-bc1f-f52b" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink name="SRS Mine Clearance [3.07a]" id="346e-caf9-c353-5bf6" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
@@ -2957,7 +2957,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="8f5a-f6b9-e87f-a897" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="8f5a-f6b9-e87f-a897" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
@@ -2982,7 +2982,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="ad28-627c-6fc9-d9ff" name="Wavelurker [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
         <infoLink id="923d-25b9-1d8c-7d4b" name="Copernicus" hidden="false" targetId="d14e-97e2-956f-047a" type="profile"/>
         <infoLink id="304e-9388-625e-6bb1" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="71e8-7c8c-08a7-73d8" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="71e8-7c8c-08a7-73d8" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="7c8e-6926-e767-6266" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -3102,7 +3102,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="351f-afff-2e2c-df09" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="351f-afff-2e2c-df09" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
@@ -3126,7 +3126,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="d206-05e5-10dd-2618" name="Mine Sweeper [3.07a]" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
         <infoLink id="cdca-4c41-1d3f-0163" name="Useful Freight [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="2fcd-3a8e-8d93-52af" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="b7ad-73b5-dcb6-cd34" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
-        <infoLink id="8114-f6b1-33ae-1552" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="8114-f6b1-33ae-1552" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="ee38-d858-4a8d-21b9" name="Enlightened" hidden="false" targetId="d580-e7cf-5353-e2bb" primary="true"/>
@@ -3217,7 +3217,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="f7b4-f20e-6fa9-9ff2" name="Combat Air Patrol [3.07a]" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
         <infoLink id="db87-3525-bdda-e569" name="Wavelurker [3.06]" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
         <infoLink id="6cb3-8702-5198-b6a8" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="076c-706d-2fdf-b8be" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="076c-706d-2fdf-b8be" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="bdfa-a411-fbfd-c96f" name="SRS Recon [3.07a]" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
         <infoLink id="465c-00c4-7c4c-6f66" name="Hunter (x) [3.06a]" hidden="false" targetId="a81f-96a2-3f13-18f9" type="rule">
           <modifiers>
@@ -3280,7 +3280,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
       <infoLinks>
         <infoLink id="4156-d2b7-b7d2-73ed" name="Hypatia" hidden="false" targetId="8cec-e9ee-f431-8360" type="profile"/>
         <infoLink id="23d2-d6fc-0b00-12b4" name="Wavelurker [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
-        <infoLink id="fb47-3e49-1939-30c8" name="Luminiferous Defences [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="fb47-3e49-1939-30c8" name="Luminiferous Defences [3.07]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="2ea4-321d-77fc-83d8" name="Enlightened Science [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
         <infoLink id="ff27-8108-e482-5601" name="Heavy Firepower [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="d3fe-c528-1650-4776" name="Vulnerable Stern [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
@@ -3547,7 +3547,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="2d43-8c9f-0eab-c74d" name="Temperamental Design [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="1ea8-5ef6-de30-f3ae" type="rule"/>
         <infoLink id="3e30-2702-b649-1d7f" name="Naval Shield Amplifier [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="88a0-dba5-7dde-aa3e" type="rule"/>
         <infoLink id="8715-af6f-8c02-22cc" name="Enlightened Science [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="5b30-6da2-4016-0af6" name="Luminiferous Defences [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="5b30-6da2-4016-0af6" name="Luminiferous Defences [3.07]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="11d5-09d5-5e9f-6d12" name="Enlightened Generator Ship [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="1b71-a146-9018-17b4" type="rule"/>
         <infoLink id="cac8-fc3c-2334-4637" name="Heavy Firepower [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="9a3a-cd1d-52ad-b5cc" name="Wavelurker [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
@@ -3681,7 +3681,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
       <infoLinks>
         <infoLink id="463d-3600-5e4d-5d7e" name="Vesalius" hidden="false" targetId="4e8c-3b9f-24ab-0513" type="profile"/>
         <infoLink id="2a3b-8e30-bda7-41b7" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="a2db-1bd2-fca7-6f3a" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="a2db-1bd2-fca7-6f3a" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="d43b-4451-bc60-e68c" name="Mine Layer [3.07a]" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
         <infoLink id="5e30-3935-d26b-c157" name="Mine Sweeper [3.07a]" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
         <infoLink id="92a3-7011-58f1-f620" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
@@ -3715,7 +3715,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         </selectionEntry>
       </selectionEntries>
       <entryLinks>
-        <entryLink id="b149-3240-3da9-32be" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="2">
+        <entryLink id="b149-3240-3da9-32be" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
@@ -3744,7 +3744,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
             <modifier type="set" value="Bombardment (Aerial)" field="name"/>
           </modifiers>
         </infoLink>
-        <infoLink id="cbb0-de72-f563-e614" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="cbb0-de72-f563-e614" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="2fe6-1c3a-567c-7a77" name="Spotter [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="a1bc-b8ca-950c-db31" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="40d5-89c7-2311-dba9" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
@@ -3860,7 +3860,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
             <modifier type="set" value="Focused Fire (Gunnery)" field="name"/>
           </modifiers>
         </infoLink>
-        <infoLink id="263b-9a74-e9e3-1bb1" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="263b-9a74-e9e3-1bb1" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="9f1e-b22f-8a90-a760" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -4072,7 +4072,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
       <infoLinks>
         <infoLink id="7f20-9981-a63b-fc99" name="Newton" hidden="false" targetId="0909-d20d-904f-a960" type="profile"/>
         <infoLink id="deec-b0e7-7ce2-3024" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="2db5-2443-da8a-2d56" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="2db5-2443-da8a-2d56" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="9ddb-77f3-7e06-27fd" name="Void Shepherd [3.06]" hidden="false" targetId="f5c1-43d6-e9a5-bec7" type="rule"/>
         <infoLink id="1d10-7706-cebb-15e1" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
@@ -4081,12 +4081,12 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <categoryLink id="3a8a-d7a3-28b6-f525" name="Enlightened" hidden="false" targetId="d580-e7cf-5353-e2bb" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="955b-a2f5-a314-751f" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="3">
+        <entryLink id="955b-a2f5-a314-751f" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
         </entryLink>
-        <entryLink id="7459-95e1-82af-76cf" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="4">
+        <entryLink id="7459-95e1-82af-76cf" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
@@ -4113,7 +4113,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="c0e5-4355-f3ca-2e6f" name="Hydrophone Relay [3.07a]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="1b80-20ba-6dae-7094" type="rule"/>
         <infoLink id="db39-3806-84b7-fb17" name="The Belgica" hidden="false" targetId="e526-eca0-407b-c680" type="profile"/>
         <infoLink id="1e5d-6643-4ee6-7210" name="Agitation Harmoniser [3.06]" hidden="false" targetId="53ad-7286-fd8e-bea9" type="rule"/>
-        <infoLink id="514b-6bce-1862-7ea2" name="Luminiferous Defences [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="514b-6bce-1862-7ea2" name="Luminiferous Defences [3.07]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="6086-f6d1-ae78-8439" name="Turbo Encabulation Drive [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="b7dc-b12d-695d-bc85" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
         <infoLink id="d000-8020-1cb7-4130" name="Wavelurker [3.06]" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
@@ -4173,7 +4173,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="b825-3fc8-5cc5-f1de" name="Agitation Harmoniser [3.06]" hidden="false" targetId="53ad-7286-fd8e-bea9" type="rule"/>
-        <infoLink id="9441-f8cd-0adb-b3de" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="9441-f8cd-0adb-b3de" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="19a2-4261-7e6c-815a" name="Turbo Encabulation Drive [3.06]" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="d3ee-589d-0670-bff4" name="The Schneider" hidden="false" targetId="15cd-0598-9bec-f8ac" type="profile">
           <modifiers>
@@ -4270,7 +4270,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="e2f5-43ec-c09d-2f90" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="29eb-15c5-07f6-26ef" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="29eb-15c5-07f6-26ef" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="e9ea-6bb4-37eb-3b56" name="Priority Signals [3.07a]" hidden="false" targetId="4106-315d-4d5c-9e8f" type="rule"/>
         <infoLink id="4b90-4287-d826-3fe5" name="Flak Barrage (x) [3.07a]" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
@@ -4579,7 +4579,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
             <modifier type="append" field="name" value="(4)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="cbe0-0b06-a1cb-a59d" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="cbe0-0b06-a1cb-a59d" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="60ce-4c28-76ed-5d42" name="Daedelus" hidden="false" targetId="f104-5c79-0cbd-3e99" type="profile"/>
         <infoLink id="2244-1d91-d06b-0647" name="Heavy Firepower [3.07a]" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="31eb-1fc0-ed77-bb99" name="Aerial Shield Projector [3.06]" hidden="false" targetId="0d05-767f-09de-5a63" type="rule"/>
@@ -4697,7 +4697,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
       <entryLinks>
         <entryLink id="4f2d-f400-0ca8-75c3" name="Magnetic generator" hidden="false" collective="false" import="false" targetId="aaa0-4dc5-d12f-fcf9" type="selectionEntry" sortIndex="4"/>
         <entryLink id="ec19-93ec-dc0f-611d" name="Shield generator" hidden="false" collective="false" import="false" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="3"/>
-        <entryLink import="false" name="Advanced Aetheric Lance" hidden="false" id="7582-36a9-0d81-2007" collective="false" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="2">
+        <entryLink import="false" name="Aetheric Lance" hidden="false" id="7582-36a9-0d81-2007" collective="false" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" value="f2af-2773-24ff-2e12" field="category"/>
           </modifiers>
@@ -4728,7 +4728,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="9250-84fc-3ee0-d997" name="SRS Mine Clearance [3.07a]" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
         <infoLink id="d119-7a37-eaa8-0aaf" name="Elite Crew [3.07a]" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
         <infoLink id="3a70-1371-0f18-31e6" name="Wavelurker [3.06]" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
-        <infoLink id="7e84-a991-f5e3-4e5d" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="7e84-a991-f5e3-4e5d" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="f6fb-a03f-49de-b0c4" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="6162-a784-6a36-b1ff" name="SRS Recon [3.07a]" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
       </infoLinks>
@@ -5029,7 +5029,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         </infoLink>
         <infoLink id="84da-ac4d-cf91-2f4f" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
         <infoLink id="5163-cdd2-e309-5414" name="Automata Repair Platform [3.06]" hidden="false" targetId="ad21-8a8b-501a-f08c" type="rule"/>
-        <infoLink id="405a-1954-cd93-03c0" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="405a-1954-cd93-03c0" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="9878-6050-bea4-2196" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="51e5-aadd-280f-e602" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
       </infoLinks>
@@ -5043,7 +5043,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="a75a-4de7-e44e-997e" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="a75a-4de7-e44e-997e" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
@@ -5067,7 +5067,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="7bc4-a86f-ba7b-2566" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="407b-183e-ea02-4b46" name="Cross the Beams [3.06]" hidden="false" targetId="ce83-fa57-1470-b52a" type="rule"/>
         <infoLink id="e408-2876-91a7-a96f" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="2ac-401-1425-4b61" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="2ac-401-1425-4b61" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="cb9a-93ba-41a9-4ae9" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -5151,7 +5151,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="49c2-4f8b-0c99-917a" name="Pytheus" hidden="false" targetId="030d-c6db-70e1-1e49" type="profile"/>
         <infoLink id="7e35-2349-af79-3102" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="a69b-9b99-2162-6d0c" name="Cloud Dive [3.07a]" hidden="false" targetId="52c5-a8f6-6309-f95c" type="rule"/>
-        <infoLink id="5cdb-ca67-f55f-d989" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="5cdb-ca67-f55f-d989" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="ea0c-7dd1-bd8f-f4c1" name="SRS Recon [3.07a]" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
         <infoLink id="a0bb-9f63-c714-b3fb" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
         <infoLink id="2436-fc68-979-1511" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
@@ -5203,7 +5203,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="f35b-a234-9a8e-9bf4" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="984b-8df7-1701-48f0" name="Forward Deployment [3.07a]" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
         <infoLink id="380e-13e1-6036-29f9" name="Helion Cohort [3.06]" hidden="false" targetId="7889-ee0d-75fa-af56" type="rule"/>
-        <infoLink id="5db1-e074-53b5-36b3" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="5db1-e074-53b5-36b3" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="6902-23a4-b1f5-ebac" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="97a2-1015-d20c-3002" name="Onyx Clade Targeting Array [3.06]" hidden="false" targetId="8ceb-485c-e0f7-92e" type="rule"/>
         <infoLink id="b15d-31e9-fbcf-d5a4" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
@@ -5295,7 +5295,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="d1ce-e333-3d15-71da" name="Euclid" hidden="false" targetId="2fe3-bf6b-34b7-679c" type="profile"/>
         <infoLink id="3c49-ec47-08b5-b519" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="201f-bfe8-9e28-e6ca" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="0597-3cfe-d257-d020" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="0597-3cfe-d257-d020" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="406e-4782-9108-08ac" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="5c94-354b-6e5c-a851" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="2951-f19c-3bc7-a6c9" name="Forward Deployment [3.07a]" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
@@ -5388,7 +5388,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="4c4f-eab3-590c-1edf" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
         <infoLink id="495b-b652-cde9-44a1" name="Low-Level Strike [3.07a]" hidden="false" targetId="0054-ea91-5408-283a" type="rule"/>
         <infoLink id="b8df-c818-0240-c7ec" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="2dda-c9d2-2eca-673a" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="2dda-c9d2-2eca-673a" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="fd31-8614-b86d-e399" name="Interphase Navigator [3.06]" hidden="false" targetId="9f4c-7f3f-dced-ba2f" type="rule"/>
         <infoLink name="Turbo Encabulation Drive [3.06]" id="c30e-5b4b-fab1-8461" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="90b6-135c-554b-9e3b" name="Onyx Clade Targeting Array [3.06]" hidden="false" targetId="8ceb-485c-e0f7-92e" type="rule"/>
@@ -5428,7 +5428,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
       <infoLinks>
         <infoLink id="62c6-906b-c38f-32be" name="Zumeena" hidden="false" targetId="7d0a-b877-6b49-58c0" type="profile"/>
         <infoLink id="26d1-0497-0da4-4538" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="e36e-81a7-eadb-8a07" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="e36e-81a7-eadb-8a07" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="a0d8-ac5a-9970-e744" name="Volatile [3.06]" hidden="false" targetId="f015-bcf9-3b35-1936" type="rule"/>
         <infoLink id="bbfd-50f4-f087-b46a" name="Supply Depot [3.07a]" hidden="false" targetId="23f5-7a90-116f-cba1" type="rule"/>
         <infoLink id="d53a-0a61-886f-cd9d" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
@@ -5440,12 +5440,12 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <categoryLink id="cc63-95b4-ecec-1851" name="Capacitor Ship" hidden="false" targetId="04a7-8672-984a-8713" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="11f4-a027-0aae-7c3a" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="11f4-a027-0aae-7c3a" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
         </entryLink>
-        <entryLink id="fdd2-c661-909a-5a8d" name="Advanced Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="fdd2-c661-909a-5a8d" name="Aetheric Lance" hidden="false" collective="false" import="false" targetId="2492-854e-2179-e50b" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
@@ -5493,7 +5493,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
           </modifiers>
         </infoLink>
         <infoLink id="08a8-f5d8-65db-5308" name="Heavy Firepower [3.07a]" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="3cc1-e0d2-9f97-71e5" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="3cc1-e0d2-9f97-71e5" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="c58b-7378-dc23-cff3" name="SRS Mine Clearance [3.07a]" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
         <infoLink id="1cf4-63be-adc7-28bb" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
         <infoLink id="3633-cefd-a527-779" name="Turbo Encabulation Drive [3.06]" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
@@ -5677,7 +5677,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="22a0-5426-d0cf-5af9" name="Helion Cohort [3.06]" hidden="false" targetId="7889-ee0d-75fa-af56" type="rule"/>
         <infoLink id="7ee9-aaa7-58b8-0223" name="Turbo Encabulation Drive [3.06]" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="b770-6ef2-ec35-fc9c" name="Heavy Firepower [3.07a]" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="7b4c-d999-00d5-070a" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="7b4c-d999-00d5-070a" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="8a23-7ca2-eca3-a324" name="Onyx Clade Targeting Array [3.06]" hidden="false" targetId="8ceb-485c-e0f7-92e" type="rule"/>
         <infoLink id="e26a-b1a8-e6e4-4afe" name="Emergency Saucer Separation [3.06]" hidden="false" targetId="a5f1-c2b8-587e-29fe" type="rule"/>
         <infoLink id="4a38-7e7e-45bd-d559" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
@@ -5821,7 +5821,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="735d-1d59-fc02-0750" name="Forward Deployment [3.07a]" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
         <infoLink id="5207-7419-db28-bdec" name="Heavy Escort [3.07a]" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
         <infoLink id="9f77-5cd2-5726-da59" name="Immobile [3.07a]" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
-        <infoLink id="b5da-d334-c5d6-82f3" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="b5da-d334-c5d6-82f3" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="9c46-f0b9-f762-7fd2" name="Strategic Asset [3.07a]" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
         <infoLink id="57a4-a0cc-5f5e-e435" name="Supply Depot [3.07a]" hidden="false" targetId="23f5-7a90-116f-cba1" type="rule"/>
         <infoLink id="0e58-84aa-1f4d-4497" name="Useful Freight [3.07a]" hidden="false" targetId="2fcd-3a8e-8d93-52af" type="rule"/>
@@ -6027,7 +6027,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="2921-414a-0c35-06fb" name="Forward Deployment [3.07a]" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
         <infoLink id="cdba-f66f-fa0b-6a77" name="Heavy Escort [3.07a]" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
         <infoLink id="4f55-f367-fc9a-fe49" name="Immobile [3.07a]" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
-        <infoLink id="aef6-1182-e0dd-8cd7" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="aef6-1182-e0dd-8cd7" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="ac1b-ec58-326a-9e25" name="Enlightened Science [3.06]" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -6487,7 +6487,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink id="4c09-7e16-665c-28f9" name="Wavelurker [3.06]" hidden="false" targetId="3862-7540-3def-6ec1" type="rule"/>
         <infoLink id="c681-cf59-6b94-9f75" name="Ruby Focus Crystals [3.06]" hidden="false" targetId="6598-6f8d-5ad0-3f0c" type="rule"/>
         <infoLink id="7c97-e19d-3a33-76f" name="Turbo Encabulation Drive [3.06]" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
-        <infoLink name="Luminiferous Defences [3.06]" id="7f1f-fbd9-5902-139e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink name="Luminiferous Defences [3.07]" id="7f1f-fbd9-5902-139e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="a113-3e6f-d20a-7b23" name="Enlightened" hidden="false" targetId="d580-e7cf-5353-e2bb" primary="true"/>
@@ -6583,7 +6583,7 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
         <infoLink name="Deep Dive [3.07a]" id="58ef-d4fc-6720-1d1d" hidden="false" type="rule" targetId="3bf2-4bf2-c33d-95ab"/>
         <infoLink name="Enlightened Science [3.06]" id="d6e6-ae09-c806-d198" hidden="false" type="rule" targetId="95d3-c242-ee78-9b3b"/>
         <infoLink name="Forward Deployment [3.07a]" id="62a9-53a4-81b0-af9b" hidden="false" type="rule" targetId="e8f8-a4d2-d40c-1467"/>
-        <infoLink name="Luminiferous Defences [3.06]" id="b03a-9db7-22f3-9aa9" hidden="false" type="rule" targetId="5a79-12a4-77b3-9619"/>
+        <infoLink name="Luminiferous Defences [3.07]" id="b03a-9db7-22f3-9aa9" hidden="false" type="rule" targetId="5a79-12a4-77b3-9619"/>
         <infoLink name="Maritime Patrol [3.07a]" id="b37e-823e-d836-f493" hidden="false" type="rule" targetId="0b7c-6003-8433-2817"/>
         <infoLink name="Triangulated Solution [3.07a]" id="b705-3860-50ca-c278" hidden="false" type="rule" targetId="8d45-38e1-cce2-fbf2"/>
         <infoLink name="Vulnerable Stern [3.07a]" id="e003-da8b-628c-df35" hidden="false" type="rule" targetId="ac3f-24c4-12e2-f3f1"/>
@@ -7412,9 +7412,6 @@ Review 3.06.00: v18 (Orbat 3.06 17/06/2024 released xx/07/2024)</readme>
     <catalogueLink id="26cf-c0f2-890a-eb40" name="Common" targetId="f2ed-a910-ca64-9be7" type="catalogue" importRootEntries="true"/>
     <catalogueLink type="catalogue" name="Enlightened Automata" id="810a-1128-4d7c-cd28" targetId="68f4-e16c-8755-4269"/>
   </catalogueLinks>
-  <infoLinks>
-    <infoLink name="Colossus [3.07a]" id="785c-94cd-087f-ae18" hidden="false" type="rule" targetId="f9be-f519-a9c2-f311"/>
-  </infoLinks>
   <sharedSelectionEntryGroups>
     <selectionEntryGroup name="Attached Unit [Enlightened]" id="0a58-3255-15a4-06ae" hidden="false" collective="false" import="false">
       <constraints>
diff --git a/Generator.cat b/Generator.cat
index cecf837..3ce76c2 100644
--- a/Generator.cat
+++ b/Generator.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="f69c-988c-fae3-e664" name="Generator" revision="23" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="f69c-988c-fae3-e664" name="Generator" revision="24" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <readme>Review 1.00.00: generator collection
 Review 3.04.00: all generator included and updated
 Review 3.04.01: all generator included and updated. added 3.03 Orbat change
@@ -291,8 +291,40 @@ Review 3.06.09: Crown 3.06a</readme>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="639b-ec28-97e7-a357" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="fc3e-a3e1-8d44-8467" name="Portal generator" hidden="false" targetId="bbcb-e6ac-1e89-35d2" type="profile"/>
-        <infoLink id="3109-d308-bc05-03cd" name="Portal generator [3.06]" hidden="false" targetId="7934-e919-e869-4ef7" type="rule"/>
+        <infoLink id="fc3e-a3e1-8d44-8467" name="Portal generator" hidden="false" targetId="bbcb-e6ac-1e89-35d2" type="profile">
+          <modifierGroups>
+            <modifierGroup type="and">
+              <modifiers>
+                <modifier type="append" value="(1)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="0c85-39c7-9145-efeb" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+                <modifier type="append" value="(2)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8901-cc02-f55e-2ee5" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+                <modifier type="append" value="(3)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="179a-4bc3-c4d4-b5d5" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+                <modifier type="append" value="(4)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="5935-bcd7-b498-5f40" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+                <modifier type="append" value="(8)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="967e-22a1-ae69-7b4f" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+            </modifierGroup>
+          </modifierGroups>
+        </infoLink>
+        <infoLink id="3109-d308-bc05-03cd" name="Portal generator [3.07]" hidden="false" targetId="7934-e919-e869-4ef7" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="82f0-7580-ae32-45d6" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
@@ -454,7 +486,39 @@ Review 3.06.09: Crown 3.06a</readme>
       </constraints>
       <infoLinks>
         <infoLink id="dfdc-5b6b-4f22-3f28" name="Portal generator" hidden="false" targetId="bbcb-e6ac-1e89-35d2" type="profile"/>
-        <infoLink id="db7f-4832-4b14-d1de" name="Portal generator [3.06]" hidden="false" targetId="7934-e919-e869-4ef7" type="rule"/>
+        <infoLink id="db7f-4832-4b14-d1de" name="Portal generator [3.07]" hidden="false" targetId="7934-e919-e869-4ef7" type="rule">
+          <modifierGroups>
+            <modifierGroup type="and">
+              <modifiers>
+                <modifier type="append" value="(1)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="parent" childId="0c85-39c7-9145-efeb" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+                <modifier type="append" value="(2)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="parent" childId="8901-cc02-f55e-2ee5" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+                <modifier type="append" value="(3)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="parent" childId="179a-4bc3-c4d4-b5d5" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+                <modifier type="append" value="(4)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="parent" childId="5935-bcd7-b498-5f40" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+                <modifier type="append" value="(8)" field="name">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="parent" childId="967e-22a1-ae69-7b4f" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+            </modifierGroup>
+          </modifierGroups>
+        </infoLink>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="3db9-a546-4d27-24be" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
@@ -954,8 +1018,8 @@ Iceberg Obstacles may not be placed within 5” of an Enemy Model. Cryogenic Bla
         <modifier type="set" value="Mirage generator" field="name"/>
       </modifiers>
     </rule>
-    <rule id="7934-e919-e869-4ef7" name="Portal generator [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
-      <description>This Generator may be used by a Unit as a Special Operations Action. This Unit may place a 40mm Portal Token within 5” of itself. Each additional Portal Generator in this Unit increases the distance that each Portal Token may be deployed by +10” (to a maximum range of 25”). If there are three or more Models in the Unit with Portal Generators, the Unit may instead place up to two Portal Tokens within 5”. During the Round, any friendly Unit with the Sultanate Trait making an Attack with the Bomb or Broadside Qualities that has a friendly Portal Token within 4” of that Unit may measure the range of the Attack as though being made from any other friendly Portal Token. The Attacking Unit still requires Line of Sight to the Initial Target, but the weapon must replace their listed Fire Arc with a 360-degree Fire Arc if used with a Portal. Escort Tokens cannot provide a benefit to this Attack. Furthermore, during the Reserves Step of that Round, when a friendly Mass 2 or Mass 1 Unit deploys from reserves, it may be deployed in base contact with any friendly Portal Token rather than using any other deployment options. Each Model in the Reserve Unit must be deployed in base contact with the same Portal Token and receives a Level of Disorder. Remove the friendly Portal Token once a Reserve Unit has been deployed using it, or an Attack using the Bomb or Broadside Qualities has been measured from it. Finally, remove all remaining Portal Tokens from the Play Area at the start of the Maintenance Step. Joining Units cannot take Portal Generators. Generators listed on a Unit’s profile may not be removed or replaced unless specified.</description>
+    <rule id="7934-e919-e869-4ef7" name="Portal generator [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <description>As a Special Operations Action, this Unit may place number of 40mm Portal Tokens within 5” of a Model in this Unit with a Portal Generator. The number of Portal Tokens that may be Placed is indicated in brackets. Each additional Model with a Portal Generator in this Unit increases the distance that any Portal Token may be Placed by the Unit by +10” (to a maximum range of 20”).</description>
       <modifiers>
         <modifier type="set" value="Portal generator" field="name"/>
       </modifiers>
diff --git a/Imperium.cat b/Imperium.cat
index f88e524..badf457 100644
--- a/Imperium.cat
+++ b/Imperium.cat
@@ -1382,7 +1382,7 @@
         <categoryLink name="Scandinavian" hidden="false" id="51f9-9235-8767-e8b0" targetId="a56c-f22b-481d-315d" primary="false"/>
       </categoryLinks>
     </entryLink>
-    <entryLink id="2ad2-2c5e-760f-0d04" name="Baldur Shock Raider Squadron" hidden="true" collective="false" import="true" targetId="a7be-32d7-d157-aafc" type="selectionEntry">
+    <entryLink id="2ad2-2c5e-760f-0d04" name="Baldr Shock Raider Squadron" hidden="true" collective="false" import="true" targetId="a7be-32d7-d157-aafc" type="selectionEntry">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
           <conditionGroups>
@@ -1398,7 +1398,7 @@
       </modifiers>
       <categoryLinks>
         <categoryLink id="7649-64e9-05c3-4578" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
-        <categoryLink name="Baldur-Class" hidden="false" id="2d88-4cb3-7aa3-7fdc" targetId="10c7-e5e9-2401-69a0" primary="false"/>
+        <categoryLink name="Baldr-Class" hidden="false" id="2d88-4cb3-7aa3-7fdc" targetId="10c7-e5e9-2401-69a0" primary="false"/>
         <categoryLink name="Scandinavian" hidden="false" id="0189-e2ef-a20f-e82f" targetId="a56c-f22b-481d-315d" primary="false"/>
       </categoryLinks>
     </entryLink>
@@ -6418,7 +6418,7 @@
       <categoryLinks>
         <categoryLink id="d6d0-1594-f33f-b63c" name="Imperium" hidden="false" targetId="381f-fee3-786c-1414" primary="false"/>
         <categoryLink id="f5a0-73e0-2633-12ca" name="Aerial Linebreaker" hidden="false" targetId="cbad-adb3-56aa-e640" primary="false"/>
-        <categoryLink id="0c93-3586-2de5-6efc" name="Maximilian-class" hidden="false" targetId="afbe-51c2-6a95-573f" primary="false"/>
+        <categoryLink id="0c93-3586-2de5-6efc" name="Maximilian-Class" hidden="false" targetId="afbe-51c2-6a95-573f" primary="false"/>
         <categoryLink id="94e4-b8da-fc68-7f87" name="Bavarian" hidden="false" targetId="ee36-4047-83f2-7b11" primary="false"/>
         <categoryLink id="04d3-b17c-ecbe-17d1" name="Teutonic" hidden="false" targetId="47a7-7ba3-45db-b846" primary="false"/>
       </categoryLinks>
@@ -6856,7 +6856,7 @@
       <categoryLinks>
         <categoryLink id="f7e7-feca-d9fc-f607" name="Imperium" hidden="false" targetId="381f-fee3-786c-1414" primary="false"/>
         <categoryLink id="9b9a-773b-ec7d-f51a" name="Bavarian" hidden="false" targetId="ee36-4047-83f2-7b11" primary="false"/>
-        <categoryLink id="1b49-438b-c853-173" name="Nuremberg Class" hidden="false" targetId="848a-0b07-b832-4251" primary="false"/>
+        <categoryLink id="1b49-438b-c853-173" name="Nuremberg-Class" hidden="false" targetId="848a-0b07-b832-4251" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="90b6-3e2b-cfc7-6225" name="Variants" hidden="false" collective="false" import="true" defaultSelectionEntryId="39c4-1b3a-3cc4-9e0f">
@@ -7014,7 +7014,7 @@
       <categoryLinks>
         <categoryLink id="e75a-e12e-0599-181e" name="Imperium" hidden="false" targetId="381f-fee3-786c-1414" primary="false"/>
         <categoryLink id="76e5-183e-4d4c-70e1" name="Teutonic" hidden="false" targetId="47a7-7ba3-45db-b846" primary="false"/>
-        <categoryLink id="74a0-70f8-b4ab-7f2d" name="Metzger Class" hidden="false" targetId="deb5-bbe7-6b77-def9" primary="false"/>
+        <categoryLink id="74a0-70f8-b4ab-7f2d" name="Metzger-Class" hidden="false" targetId="deb5-bbe7-6b77-def9" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="3608-eda7-040d-dfe8" name="Variants" hidden="false" collective="false" import="true" defaultSelectionEntryId="1099-884a-69f0-f490">
@@ -8991,12 +8991,12 @@
             <categoryLink id="1c5f-ecd4-849c-6fab" name="Front Second" hidden="false" targetId="c595-958b-800e-2c04" primary="false"/>
           </categoryLinks>
         </entryLink>
-        <entryLink id="d0cd-2632-7361-4ed3" name="Volt Gun Battery" hidden="false" collective="false" import="true" targetId="2922-fa0a-076a-3713" type="selectionEntry" sortIndex="8">
+        <entryLink id="d0cd-2632-7361-4ed3" name="Volt Gun Battery" hidden="false" collective="false" import="true" targetId="9128-f707-ac48-b896" type="selectionEntry" sortIndex="8">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
         </entryLink>
-        <entryLink id="450f-22dc-e169-41d6" name="Volt Gun Battery" hidden="false" collective="false" import="true" targetId="2922-fa0a-076a-3713" type="selectionEntry" sortIndex="9">
+        <entryLink id="450f-22dc-e169-41d6" name="Volt Gun Battery" hidden="false" collective="false" import="true" targetId="9128-f707-ac48-b896" type="selectionEntry" sortIndex="9">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
diff --git a/Rules.cat b/Rules.cat
index 3385c86..0eeb1bf 100644
--- a/Rules.cat
+++ b/Rules.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="edc4-1a6a-03e6-7be9" name="Rules" revision="26" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="edc4-1a6a-03e6-7be9" name="Rules" revision="27" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <comment>Update to ORBAT 3.06</comment>
   <readme>Rules collection</readme>
   <sharedRules>
@@ -54,7 +54,7 @@
         <modifier type="set" value="Armoured Decking" field="name"/>
       </modifiers>
     </rule>
-    <rule id="e0a4-52b6-676c-9b6d" name="Celerity [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="e0a4-52b6-676c-9b6d" name="Celerity [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Once per Activation, this Unit may make the following Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Each Model in the Unit with this rule, that has caused at least one point of damage in a Ramming Action this Activation, may make a second Ramming Action against the same or a new Point of Impact within 3” of the first. The Action Dice Pool for the second Ram is the same as the first. The Moving Model may not use Vigour with this rule and may not make any further movement this Activation if it uses this rule.</description>
       <modifiers>
         <modifier type="set" value="Celerity" field="name"/>
@@ -304,8 +304,8 @@ Encounter.</description>
         <modifier type="set" value="SRS Mine Clearance" field="name"/>
       </modifiers>
     </rule>
-    <rule id="e76e-276f-d917-c7a4" name="SRS Portal Strike [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
-      <description>When Launching SRS during the Operations Step, a Unit with this rule with an online Portal Generator may also place an additional Portal Token within 5” of itself. If it does so, any SRS Tokens launched during that Operations Step by the Unit may be placed within 40” of any Portal Token in the Play Area.</description>
+    <rule id="e76e-276f-d917-c7a4" name="SRS Portal Strike [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <description>When Launching SRS during the Operations Step, a Unit with this rule in base contact with a Portal Token may place its SRS Tokens within 40” of any Portal Token in the Play Area. Remove the Portal Token in base contact with this Model once the SRS Tokens are Placed.</description>
       <modifiers>
         <modifier type="set" value="SRS Portal Strike" field="name"/>
       </modifiers>
@@ -376,7 +376,7 @@ Encounter.</description>
         <modifier type="set" value="Vanguard" field="name"/>
       </modifiers>
     </rule>
-    <rule id="91f7-3138-f1c6-4770" name="Vigour [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="91f7-3138-f1c6-4770" name="Vigour [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Once per Activation, this Unit may make the following Valour Effect. Models in this Unit with this rule gain the Sustained Quality to their Ramming Action Dice Pool. Furthermore, as the same Valour Effect they gain +6 to their Ramming Dice Pool if the Initial Target has the Colossus rule.</description>
       <modifiers>
         <modifier type="set" value="Vigour" field="name"/>
@@ -481,8 +481,8 @@ Encounter.</description>
         <modifier type="set" value="Sturginium Agitators" field="name"/>
       </modifiers>
     </rule>
-    <rule id="5a79-12a4-77b3-9619" name="Luminiferous Defences [3.06]" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>Any Attack against a non-Obscured Model with this rule counts Heavy Hit results as Hit Results instead in the Attack Action Dice Pool. Furthermore, any Unit with this rule may use their Crippled ADV to defend against any Attack with the Gunnery, or Broadside Qualities. Mass 1 Models use their Battle-Ready ADV. Submerged Models, Crippled Models or Models with Shredded Defences cannot use Luminiferous Defences.</description>
+    <rule id="5a79-12a4-77b3-9619" name="Luminiferous Defences [3.07]" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Units with this rule may use a Defence Action Dice Pool equal to their Battle-Ready ADV to defend against any Attack with the Gunnery, or Broadside Qualities. Crippled Models or Models with Shredded Defences cannot use Luminiferous Defences.</description>
       <modifiers>
         <modifier type="set" value="Luminiferous Defences" field="name"/>
       </modifiers>
@@ -511,10 +511,10 @@ Encounter.</description>
         <modifier type="set" value="Pycrete Construction" field="name"/>
       </modifiers>
     </rule>
-    <rule id="db90-0b63-d0f9-5222" name="Portal Mastery [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
-      <description>A Model with this rule may, as a Special Operations Action, place a second 40mm Portal Token within 20” of itself. While a Model from this Unit is within 5” of a friendly Portal Token, friendly Units with the Sultanate Trait deploying from Reserve may instead be deployed in base contact with any friendly Portal Token in the Play Area. Each Model in the Reserve Unit must be deployed in base contact with the same Portal Token. Remove the friendly Portal Token once a Reserve Unit has been deployed using it.</description>
+    <rule id="db90-0b63-d0f9-5222" name="Master Portal Generator [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <description>This Unit may Place any Portal Tokens it creates up to 20” away from it.</description>
       <modifiers>
-        <modifier type="set" value="Portal Mastery" field="name"/>
+        <modifier type="set" value="Master Portal Generator" field="name"/>
       </modifiers>
     </rule>
     <rule id="1181-0663-f1c1-9047" name="Give Em Hell [3.07a]" publicationId="e6a1-85d3-8979-7880" hidden="false">
@@ -1042,14 +1042,14 @@ Encounter.</description>
         <modifier type="set" value="Khepri SRS Tokens" field="name"/>
       </modifiers>
     </rule>
-    <rule id="4fec-a47c-2c2e-b9ea" name="Khepri SRS Capacity [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="4fec-a47c-2c2e-b9ea" name="Khepri SRS Capacity [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>The Battle-Ready Capacity / Crippled Capacity of each Model in this Unit is indicated in parenthesis. Each Model in this Unit may launch the indicated number of Khepri SRS Tokens and place those Tokens in base contact with Enemy Models in any combination Attack Runs. Any remaining Khepri SRS Tokens in the Play Area are removed in the Maintenance Step of the End Phase.</description>
       <modifiers>
         <modifier type="set" value="Khepri SRS Capacity" field="name"/>
       </modifiers>
     </rule>
-    <rule id="ef6d-9cb4-5273-88bb" name="Khepri Portal Strike [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
-      <description>When Launching Khepri SRS during the Operations Step, a Unit with this rule with an online Portal Generator may also place an additional Portal Token within 5” of itself. If it does so, any Khepri SRS Tokens launched during that Operations Step by the Unit may be placed within 20” of any Portal Token in the Play Area.</description>
+    <rule id="ef6d-9cb4-5273-88bb" name="Khepri Portal Strike [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <description>When Launching Khepri SRS during the Operations Step, a Unit with this rule in base contact with a Portal Token may place its Khepri SRS Tokens within 20” of any Portal Token in the Play Area. Remove the Portal Token in base contact with this Model once the Khepri SRS Tokens are Placed.</description>
       <modifiers>
         <modifier type="set" value="Khepri Portal Strike" field="name"/>
       </modifiers>
@@ -1096,13 +1096,13 @@ Encounter.</description>
         <modifier type="set" value="Skiff Dock" field="name"/>
       </modifiers>
     </rule>
-    <rule id="0621-51de-26b8-202f" name="The Sultan’s Hammer [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="0621-51de-26b8-202f" name="The Sultan’s Hammer [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Provided the Model with this rule declares all its Attacks with the Aerial Quality against a single Initial Target, each weapon on this Model with the Aerial Quality gains the High Velocity Quality and receives +1 Action Dice for that Shooting Step.</description>
       <modifiers>
         <modifier type="set" value="The Sultan’s Hammer" field="name"/>
       </modifiers>
     </rule>
-    <rule id="7459-7c35-54e7-3655" name="The Sultan’s Monitor [3.05]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="7459-7c35-54e7-3655" name="The Sultan’s Monitor [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Each Round, a single friendly Unit (excluding this Unit) within 15&quot; may remove all Disorder Levels from itself at the start of their Activation.</description>
       <modifiers>
         <modifier type="set" value="The Sultan’s Monitor" field="name"/>
@@ -1193,7 +1193,7 @@ Turbo Encabulation tests may not be re-rolled or otherwise manipulated except by
         <modifier type="set" value="Swordwing Strike" field="name"/>
       </modifiers>
     </rule>
-    <rule id="3348-f492-40ac-7e07" name="Orichalcite Crafted [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="3348-f492-40ac-7e07" name="Orichalcite Crafted [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Mass 1 Models in this Unit with this rule are not automatically destroyed if their Citadel is exceeded by an Attack. They suffer critical damage instead.</description>
       <modifiers>
         <modifier type="set" value="Orichalcite Crafted" field="name"/>
@@ -1379,7 +1379,7 @@ Turbo Encabulation tests may not be re-rolled or otherwise manipulated except by
         <modifier type="set" value="Huginn and Muninn" field="name"/>
       </modifiers>
     </rule>
-    <rule id="a04c-fb04-159e-ff33" name="Assigned Skiff Escort [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="a04c-fb04-159e-ff33" name="Assigned Skiff Escort [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>This Unit has two Ferik Skiff Escorts.</description>
       <modifiers>
         <modifier type="set" value="Assigned Skiff Escort" field="name"/>
@@ -1427,13 +1427,13 @@ Turbo Encabulation tests may not be re-rolled or otherwise manipulated except by
         <modifier type="set" value="Janissary Assault Bay" field="name"/>
       </modifiers>
     </rule>
-    <rule id="fd53-7d70-2295-859c" name="Cruor [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="fd53-7d70-2295-859c" name="Cruor [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Once per Activation, this Unit may make the following Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). All Models in all enemy Units within 7” immediately gain a level of Disorder.</description>
       <modifiers>
         <modifier type="set" value="Cruor" field="name"/>
       </modifiers>
     </rule>
-    <rule id="9d00-3fe4-a530-c93b" name="Soul Gnawing Dirge [3.06]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="9d00-3fe4-a530-c93b" name="Soul Gnawing Dirge [3.07]" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Enemy Models within 7” of one or more Models with this rule have -2 to their Citadel Attribute.</description>
       <modifiers>
         <modifier type="set" value="Soul Gnawing Dirge" field="name"/>
@@ -1451,7 +1451,7 @@ Turbo Encabulation tests may not be re-rolled or otherwise manipulated except by
         <modifier type="set" value="Cor Carolus Icon" field="name"/>
       </modifiers>
     </rule>
-    <rule name="Limited Generation [3.06]" hidden="false" id="f581-17a1-44d1-abcf" publicationId="d854-a2d6-3d52-44c4">
+    <rule name="Limited Generation [3.07]" hidden="false" id="f581-17a1-44d1-abcf" publicationId="d854-a2d6-3d52-44c4">
       <description>This Unit may use one Generator type per Round.</description>
       <modifiers>
         <modifier type="set" value="Limited Generation" field="name"/>
diff --git a/Sultanate.cat b/Sultanate.cat
index 7564a28..3bcd5e1 100644
--- a/Sultanate.cat
+++ b/Sultanate.cat
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7b3f-8541-c5c8-b666" name="Sultanate v3.06" revision="13" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
-  <comment>ORBAT 3.06 (published 07/02/2024)</comment>
+<catalogue id="7b3f-8541-c5c8-b666" name="Sultanate v3.07" revision="14" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+  <comment>ORBAT 3.07 (published 08/05/2024)</comment>
   <readme>Review 0.03.a0: First version published
 Review 1.01.a0: Second release
 Review 1.02.b0: Third release
@@ -13,7 +13,8 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)
 Review 3.04.01: update to ORBAT 3.04 last release (date 2023-09-01 rev2)
 Review 3.05.00: update to ORBAT 3.05 last release (date 2023-10-19) rev2
 Review 3.05.01: correction after ORBAT 3.05 update (to be used with New Recruit)
-Review 3.06.00: update to ORBAT 3.06 rev2</readme>
+Review 3.06.00: update to ORBAT 3.06 rev2
+Review 3.07.00: update to ORBAT 3.07 (published 2408xx)</readme>
   <categoryEntries>
     <categoryEntry id="24d7-a2ac-a5bb-a77d" name="Temir-Class" publicationId="d854-a2d6-3d52-44c4" hidden="false"/>
     <categoryEntry id="03eb-089a-0c01-5751" name="Turkish" publicationId="d854-a2d6-3d52-44c4" hidden="false"/>
@@ -117,151 +118,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="parent" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0d20-2ee2-7ec3-f8a3" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="1bf2-97cb-a1dc-2082" name="Aydin Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="db39-3314-eff2-a49d" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="4c16-5170-24a3-6771" name="Bayezid Class" hidden="false" targetId="a974-e10e-3d35-30fe" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0b7c-a0bb-ceae-6c4c" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="d0cd-d49f-9d0c-4d0c" name="Benghazi Class" hidden="false" targetId="f5cc-3fc4-01c4-20c0" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e94e-0720-dc41-bd3e" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="cf71-0466-25c7-90ed" name="Bursa Class" hidden="false" targetId="2bb9-b056-8541-bce3" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="27f2-d0f7-113e-ffaa" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="612e-330e-6016-a392" name="Constantinople Class" hidden="false" targetId="8d86-1a93-a17b-bbab" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7610-3bbf-c55f-e320" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="2b38-5859-2884-2dc5" name="Iskandar Class" hidden="false" targetId="6a18-ecc8-6c5b-fc1a" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3444-e8cf-d5b4-f41c" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="a250-ec52-3d59-5bc1" name="Izmir Class" hidden="false" targetId="19b7-401e-32b1-9bab" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="40f5-05cf-8069-91f1" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="6d0d-3382-eec9-a1a7" name="Jebel Class" hidden="false" targetId="2299-2547-ad8f-b67f" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="71af-fd68-24e2-b579" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="303d-6060-b7b8-7f62" name="Khoms Class" hidden="false" targetId="c257-ce33-7deb-b335" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6412-94fc-31b4-54c3" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="e773-15ef-1bcc-021e" name="Konya Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b608-5a2b-342e-05a8" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="0d4e-d6f9-0cf1-dddb" name="Mehmed Class" hidden="false" targetId="30d4-a502-0c25-e14d" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f89f-03f7-a9a2-b8ab" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="90ea-0b77-565b-1bf2" name="Mihrimah Class" hidden="false" targetId="ee25-ef25-c9fe-b811" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="22d6-84b7-3660-c4f8" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="19d5-4cde-0557-3e86" name="Morea Class" hidden="false" targetId="94b0-937f-c25a-a56d" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="df4d-9ca8-a85d-33be" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="c7e3-00ef-2a7e-e849" name="Nemrut Class" hidden="false" targetId="2b7c-78f2-2a5a-716a" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bf10-ca51-e0a0-75a7" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="0fa2-3868-11a1-c8e4" name="Pasha Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="464f-ce50-2787-6ce3" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="17ff-6a62-e26b-9fc0" name="Sadrazam Class" hidden="false" targetId="9da6-652d-beb4-f5c0" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7a7b-268b-a7d1-4091" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="a166-e2c7-5b7a-58f0" name="Temir Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0f1e-89f2-e767-f1d1" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="11aa-a992-72db-ac13" name="Hashashin Class" hidden="false" targetId="739a-f65a-92e7-ad8a" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ab37-287b-fc87-1abd" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="538b-6589-4bda-b209" name="Kopesh Class" hidden="false" targetId="0c76-eeb9-34fe-c074" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9928-80cd-4caa-c677" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="1608-b886-a8e8-3417" name="Mandjet Class" hidden="false" targetId="13b5-6bf3-f7bf-1a8d" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9c63-313d-d9e5-6518" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="cef4-5ebb-a4e3-b559" name="Mesektet Class" hidden="false" targetId="2d1c-adcb-c1e8-f49e" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7ba9-e787-0343-51e9" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="38e3-a23f-0540-fff9" name="Sabah Class" hidden="false" targetId="d21c-0e10-c102-5456" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c02e-a681-642a-b040" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="89ec-e00b-70b5-f8c1" name="Sobek Class" hidden="false" targetId="4807-c354-a654-875b" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="462e-5600-87cb-f957" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="bcc5-e4cf-e3b0-403a" name="Alsaqr Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b79b-05c6-2640-1452" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="3bb6-19c7-9b42-b560" name="Awsbiri Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e236-4da0-53cc-242c" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="4fd3-2f46-31b3-0d2b" name="Hırka Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8a6a-14e0-849e-2094" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="e89c-ed67-a1de-257d" name="Nasr Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8b08-b5cf-fb93-c16c" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="e16e-ac6d-e04f-2298" name="Spartan Class" hidden="false" targetId="47ad-68ce-369f-ed71" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="ab44-e3d5-3373-80f8" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="87b5-f6bf-369f-5fa9" name="Muharib-class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f98c-4244-9f5c-0aee" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="23cb-59ec-309e-4237" name="Main Battlefleet" hidden="false" targetId="f56a-3df4-17d2-db01" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="8c7e-2851-7cc7-872d" type="min"/>
@@ -317,97 +173,97 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="1c9b-656a-afcd-8300" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="1bf2-97cb-a1dc-2082" name="Aydin Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false">
+        <categoryLink id="1bf2-97cb-a1dc-2082" name="Aydin-Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="db39-3314-eff2-a49d" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="4c16-5170-24a3-6771" name="Bayezid Class" hidden="false" targetId="a974-e10e-3d35-30fe" primary="false">
+        <categoryLink id="4c16-5170-24a3-6771" name="Bayezid-Class" hidden="false" targetId="a974-e10e-3d35-30fe" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="0b7c-a0bb-ceae-6c4c" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="cf71-0466-25c7-90ed" name="Bursa Class" hidden="false" targetId="2bb9-b056-8541-bce3" primary="false">
+        <categoryLink id="cf71-0466-25c7-90ed" name="Bursa-Class" hidden="false" targetId="2bb9-b056-8541-bce3" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="27f2-d0f7-113e-ffaa" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="612e-330e-6016-a392" name="Constantinople Class" hidden="false" targetId="8d86-1a93-a17b-bbab" primary="false">
+        <categoryLink id="612e-330e-6016-a392" name="Constantinople-Class" hidden="false" targetId="8d86-1a93-a17b-bbab" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7610-3bbf-c55f-e320" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="2b38-5859-2884-2dc5" name="Iskandar Class" hidden="false" targetId="6a18-ecc8-6c5b-fc1a" primary="false">
+        <categoryLink id="2b38-5859-2884-2dc5" name="Iskandar-Class" hidden="false" targetId="6a18-ecc8-6c5b-fc1a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8ad2-b277-c737-4b78" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="a250-ec52-3d59-5bc1" name="Izmir Class" hidden="false" targetId="19b7-401e-32b1-9bab" primary="false">
+        <categoryLink id="a250-ec52-3d59-5bc1" name="Izmir-Class" hidden="false" targetId="19b7-401e-32b1-9bab" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="40f5-05cf-8069-91f1" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="e773-15ef-1bcc-021e" name="Konya Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false">
+        <categoryLink id="e773-15ef-1bcc-021e" name="Konya-Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b608-5a2b-342e-05a8" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="0d4e-d6f9-0cf1-dddb" name="Mehmed Class" hidden="false" targetId="30d4-a502-0c25-e14d" primary="false">
+        <categoryLink id="0d4e-d6f9-0cf1-dddb" name="Mehmed-Class" hidden="false" targetId="30d4-a502-0c25-e14d" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="f89f-03f7-a9a2-b8ab" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="90ea-0b77-565b-1bf2" name="Mihrimah Class" hidden="false" targetId="ee25-ef25-c9fe-b811" primary="false">
+        <categoryLink id="90ea-0b77-565b-1bf2" name="Mihrimah-Class" hidden="false" targetId="ee25-ef25-c9fe-b811" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="22d6-84b7-3660-c4f8" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="19d5-4cde-0557-3e86" name="Morea Class" hidden="false" targetId="94b0-937f-c25a-a56d" primary="false">
+        <categoryLink id="19d5-4cde-0557-3e86" name="Morea-Class" hidden="false" targetId="94b0-937f-c25a-a56d" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="df4d-9ca8-a85d-33be" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="c7e3-00ef-2a7e-e849" name="Nemrut Class" hidden="false" targetId="2b7c-78f2-2a5a-716a" primary="false">
+        <categoryLink id="c7e3-00ef-2a7e-e849" name="Nemrut-Class" hidden="false" targetId="2b7c-78f2-2a5a-716a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="bf10-ca51-e0a0-75a7" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="0fa2-3868-11a1-c8e4" name="Pasha Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false">
+        <categoryLink id="0fa2-3868-11a1-c8e4" name="Pasha-Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="464f-ce50-2787-6ce3" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="17ff-6a62-e26b-9fc0" name="Sadrazam Class" hidden="false" targetId="9da6-652d-beb4-f5c0" primary="false">
+        <categoryLink id="17ff-6a62-e26b-9fc0" name="Sadrazam-Class" hidden="false" targetId="9da6-652d-beb4-f5c0" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7a7b-268b-a7d1-4091" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="a166-e2c7-5b7a-58f0" name="Temir Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false">
+        <categoryLink id="a166-e2c7-5b7a-58f0" name="Temir-Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="94a2-0e4b-09f7-7b57" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="bcc5-e4cf-e3b0-403a" name="Alsaqr Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false">
+        <categoryLink id="bcc5-e4cf-e3b0-403a" name="Alsaqr-Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b79b-05c6-2640-1452" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="3bb6-19c7-9b42-b560" name="Awsbiri Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false">
+        <categoryLink id="3bb6-19c7-9b42-b560" name="Awsbiri-Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="e236-4da0-53cc-242c" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="4fd3-2f46-31b3-0d2b" name="Hırka Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false">
+        <categoryLink id="4fd3-2f46-31b3-0d2b" name="Hırka-Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8a6a-14e0-849e-2094" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="e89c-ed67-a1de-257d" name="Nasr Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false">
+        <categoryLink id="e89c-ed67-a1de-257d" name="Nasr-Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8b08-b5cf-fb93-c16c" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="5e29-71a7-0665-85de" name="Muharib-class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false">
+        <categoryLink id="5e29-71a7-0665-85de" name="Muharib-Class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="10c1-0b6b-27c4-a111" type="max"/>
           </constraints>
@@ -452,12 +308,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="2" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="30d3-fd0c-38db-b411" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="8afc-bfd9-4eb4-06da" name="Awsbiri Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false">
+        <categoryLink id="8afc-bfd9-4eb4-06da" name="Awsbiri-Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="97ff-1326-2973-d701" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="f9d1-f5ed-8cd8-9f51" name="Aydin Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false">
+        <categoryLink id="f9d1-f5ed-8cd8-9f51" name="Aydin-Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false">
           <modifiers>
             <modifier type="set" field="a006-3fec-5e3d-041e" value="0">
               <conditions>
@@ -470,17 +326,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="2960-4856-b7db-9c73" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="c9e9-7d45-3497-3609" name="Bayezid Class" hidden="false" targetId="a974-e10e-3d35-30fe" primary="false">
+        <categoryLink id="c9e9-7d45-3497-3609" name="Bayezid-Class" hidden="false" targetId="a974-e10e-3d35-30fe" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="6aa9-8aaf-456b-14ce" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="90bc-7f58-a753-1bfa" name="Bursa Class" hidden="false" targetId="2bb9-b056-8541-bce3" primary="false">
+        <categoryLink id="90bc-7f58-a753-1bfa" name="Bursa-Class" hidden="false" targetId="2bb9-b056-8541-bce3" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="f036-6d0e-2e1b-6484" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="c01b-17dc-63ec-bcff" name="Constantinople Class" hidden="false" targetId="8d86-1a93-a17b-bbab" primary="false">
+        <categoryLink id="c01b-17dc-63ec-bcff" name="Constantinople-Class" hidden="false" targetId="8d86-1a93-a17b-bbab" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="d037-5fed-70e5-7615" type="max"/>
           </constraints>
@@ -490,22 +346,22 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="6541-373e-1977-9267" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="e4e5-abf6-62bf-2e4c" name="Hırka Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false">
+        <categoryLink id="e4e5-abf6-62bf-2e4c" name="Hırka-Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="9813-9aeb-f86e-0214" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="5718-dc7c-826a-90af" name="Iskandar Class" hidden="false" targetId="6a18-ecc8-6c5b-fc1a" primary="false">
+        <categoryLink id="5718-dc7c-826a-90af" name="Iskandar-Class" hidden="false" targetId="6a18-ecc8-6c5b-fc1a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="a262-db48-f1bd-b3fa" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="6e5a-8478-ef7f-2ef5" name="Izmir Class" hidden="false" targetId="19b7-401e-32b1-9bab" primary="false">
+        <categoryLink id="6e5a-8478-ef7f-2ef5" name="Izmir-Class" hidden="false" targetId="19b7-401e-32b1-9bab" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="c47a-ae8b-5021-3677" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="148f-be0c-9578-1e47" name="Konya Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false">
+        <categoryLink id="148f-be0c-9578-1e47" name="Konya-Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false">
           <modifiers>
             <modifier type="set" field="9cf7-7b23-9d0d-5eba" value="0">
               <conditions>
@@ -518,22 +374,22 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="69d7-3550-0cea-7775" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="1414-ef81-25c4-c78c" name="Mehmed Class" hidden="false" targetId="30d4-a502-0c25-e14d" primary="false">
+        <categoryLink id="1414-ef81-25c4-c78c" name="Mehmed-Class" hidden="false" targetId="30d4-a502-0c25-e14d" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="1fb7-b264-45ca-24c1" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="0623-a075-ad4b-e71f" name="Morea Class" hidden="false" targetId="94b0-937f-c25a-a56d" primary="false">
+        <categoryLink id="0623-a075-ad4b-e71f" name="Morea-Class" hidden="false" targetId="94b0-937f-c25a-a56d" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b947-8d03-01ce-bd6a" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="a97e-8089-38cf-1691" name="Nasr Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false">
+        <categoryLink id="a97e-8089-38cf-1691" name="Nasr-Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="5334-2a91-7bec-5a39" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="a799-fc80-53ca-205d" name="Nemrut Class" hidden="false" targetId="2b7c-78f2-2a5a-716a" primary="false">
+        <categoryLink id="a799-fc80-53ca-205d" name="Nemrut-Class" hidden="false" targetId="2b7c-78f2-2a5a-716a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="d127-9fe4-c0b4-0caa" type="max"/>
           </constraints>
@@ -543,17 +399,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="parent" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="03c7-8a2d-8672-4a29" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="0947-2d32-db73-34cc" name="Pasha Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false">
+        <categoryLink id="0947-2d32-db73-34cc" name="Pasha-Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="1e4b-ba73-9398-fc09" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="7ced-9f60-568a-538d" name="Sadrazam Class" hidden="false" targetId="9da6-652d-beb4-f5c0" primary="false">
+        <categoryLink id="7ced-9f60-568a-538d" name="Sadrazam-Class" hidden="false" targetId="9da6-652d-beb4-f5c0" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="3227-a4c8-128f-233d" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="e3e6-9804-f4b4-fa31" name="Temir Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false">
+        <categoryLink id="e3e6-9804-f4b4-fa31" name="Temir-Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b3c8-7b34-db39-1c33" type="max"/>
           </constraints>
@@ -563,12 +419,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="53a9-8e49-9cbd-770b" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="3848-fa5f-65e6-b1d9" name="Alsaqr Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false">
+        <categoryLink id="3848-fa5f-65e6-b1d9" name="Alsaqr-Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8fdc-0f05-f720-b23e" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="0a03-70d1-83c7-8bd9" name="Muharib-class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false">
+        <categoryLink id="0a03-70d1-83c7-8bd9" name="Muharib-Class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8fec-dde6-afb2-8313" type="max"/>
           </constraints>
@@ -623,43 +479,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="ae50-4cfa-2894-c95d" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="c740-51eb-8b5e-01d7" name="Kopesh Class" hidden="false" targetId="0c76-eeb9-34fe-c074" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="039a-513e-e924-c857" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="e926-056b-77d2-9c14" name="Hashashin Class" hidden="false" targetId="739a-f65a-92e7-ad8a" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="d3ed-9a6f-7963-4d19" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="36ce-60ef-976a-1a52" name="Mandjet Class" hidden="false" targetId="13b5-6bf3-f7bf-1a8d" primary="false">
-          <modifiers>
-            <modifier type="set" field="e74d-9f5a-cbdb-5ef9" value="2">
-              <conditions>
-                <condition field="selections" scope="fef3-1842-580c-4bef" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="13b5-6bf3-f7bf-1a8d" type="equalTo"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="e74d-9f5a-cbdb-5ef9" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="69bf-1e32-e272-0ac8" name="Mesektet Class" hidden="false" targetId="2d1c-adcb-c1e8-f49e" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="ea19-22c5-890d-68cc" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="3007-aff4-e3fd-ca63" name="Sabah Class" hidden="false" targetId="d21c-0e10-c102-5456" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="a72e-cead-2144-1c9d" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="8a85-6e42-7f50-7a4c" name="Sobek Class" hidden="false" targetId="4807-c354-a654-875b" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="34cc-2b20-bb58-23d6" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="962c-ae7f-124a-c610" name="Main Battlefleet" hidden="false" targetId="f56a-3df4-17d2-db01" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="1cfe-f635-97ba-f4fc" type="min"/>
@@ -682,20 +501,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <modifiers>
         <modifier type="set" field="f2b4-5c00-6d31-069a" value="10">
           <conditions>
-            <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6108-7d47-dc72-c622" type="atLeast"/>
+            <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6108-7d47-dc72-c622" type="atLeast"/>
           </conditions>
         </modifier>
         <modifier type="increment" field="f2b4-5c00-6d31-069a" value="1">
-          <conditions>
-            <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="atLeast"/>
-          </conditions>
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="atLeast"/>
-                <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="atLeast"/>
-                <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="atLeast"/>
-                <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="atLeast"/>
+                <condition type="atLeast" value="1" field="forces" scope="roster" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="atLeast" value="1" field="forces" scope="roster" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="atLeast" value="1" field="forces" scope="roster" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="atLeast" value="1" field="forces" scope="roster" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -712,35 +528,53 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="e852-190e-ea9d-d241" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="c752-7336-261a-b74d" name="Submerged Unit" hidden="false" targetId="df3f-7b38-7940-f11e" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="a366-7dbf-bde3-5402" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="9df6-b5e4-32c7-af21" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="ab55-3e16-cf2a-2aa3" type="min"/>
-            <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7a3a-6d21-d2e8-4ab6" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="e986-9eca-dea1-e419" name="Praxilla-Class" hidden="false" targetId="21bf-83f5-3398-510b" primary="false" type="category">
+        <categoryLink id="2336-2a08-c612-835a" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="0af9-54f1-5ffe-4535" type="max"/>
+            <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8263-e82d-460a-3814" type="min"/>
+            <constraint field="selections" scope="force" value="2" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="fb36-9dbb-164f-de82" type="max"/>
           </constraints>
+          <modifiers>
+            <modifier type="decrement" value="1" field="fb36-9dbb-164f-de82">
+              <repeats>
+                <repeat value="1" repeats="1" field="selections" scope="force" childId="3b53-19a3-12fd-34b1" shared="true" roundUp="false"/>
+              </repeats>
+            </modifier>
+          </modifiers>
         </categoryLink>
-        <categoryLink id="358a-7ced-4200-4ccb" name="Diogenes-Class" hidden="false" targetId="fefb-ea45-e80e-e621" primary="false" type="category">
+        <categoryLink id="c752-7336-261a-b74d" name="Submerged Unit" hidden="false" targetId="df3f-7b38-7940-f11e" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="95e7-5c8d-2fa9-da86" type="max"/>
+            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="a366-7dbf-bde3-5402" type="max"/>
           </constraints>
+          <modifiers>
+            <modifier type="set" value="2" field="a366-7dbf-bde3-5402">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="atLeast" value="1" field="selections" scope="force" childId="797c-79c2-9b15-1d46" shared="true" includeChildSelections="true" includeChildForces="true"/>
+                    <condition type="atLeast" value="1" field="selections" scope="force" childId="67a1-d92b-64f1-a7d7" shared="true" includeChildSelections="true" includeChildForces="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
         </categoryLink>
-        <categoryLink id="e020-18eb-a980-a5d5" name="Lotan-Class" hidden="false" targetId="797c-79c2-9b15-1d46" primary="false" type="category">
+        <categoryLink id="f79f-caa4-89a9-92b3" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="846c-3a2e-9cc7-6f03" type="max"/>
+            <constraint field="selections" scope="parent" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7e80-046a-8df3-856f" type="min"/>
+            <constraint type="max" value="2" field="selections" scope="force" shared="false" id="1bc8-58e8-87a0-be18" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
           </constraints>
+          <modifiers>
+            <modifier type="decrement" value="1" field="1bc8-58e8-87a0-be18">
+              <repeats>
+                <repeat value="1" repeats="1" field="selections" scope="force" childId="464e-890a-84b2-8ce9" shared="true" roundUp="false"/>
+              </repeats>
+            </modifier>
+          </modifiers>
         </categoryLink>
-        <categoryLink id="118c-a2dd-6700-4fad" name="Ketos-Class" hidden="false" targetId="67a1-d92b-64f1-a7d7" primary="false" type="category">
+        <categoryLink id="9df6-b5e4-32c7-af21" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="1971-43fb-0328-dcf9" type="max"/>
+            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="ab55-3e16-cf2a-2aa3" type="min"/>
+            <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7a3a-6d21-d2e8-4ab6" type="max"/>
           </constraints>
         </categoryLink>
         <categoryLink id="6672-37e9-f08e-10d6" name="Main Battlefleet" hidden="false" targetId="f56a-3df4-17d2-db01" primary="false">
@@ -749,14 +583,14 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
               <conditionGroups>
                 <conditionGroup type="or">
                   <conditions>
-                    <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="d4c2-e85a-1b1e-5bb2" type="atLeast"/>
+                    <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6108-7d47-dc72-c622" type="atLeast"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
             </modifier>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b456-29bc-6900-a220" type="min"/>
+            <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b456-29bc-6900-a220" type="min"/>
           </constraints>
         </categoryLink>
         <categoryLink id="c054-fb3b-165c-91bb" name="Mercenary Battlefleet" hidden="false" targetId="86ff-88da-5a0b-2d81" primary="false">
@@ -765,7 +599,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
               <conditionGroups>
                 <conditionGroup type="or">
                   <conditions>
-                    <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="d4c2-e85a-1b1e-5bb2" type="atLeast"/>
+                    <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6108-7d47-dc72-c622" type="atLeast"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
@@ -780,31 +614,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="259e-e94b-0937-45db" type="min"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="eec8-232c-1298-af83" name="Alsaqr Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="5bd4-6fba-bbf8-085f" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="41d3-eff5-06d6-a16e" name="Awsbiri Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="919f-9292-36a9-2528" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="04b4-6050-71b0-fa6d" name="Hırka Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="3d3c-eeb2-6ac1-d1aa" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="6579-2e8d-f1fd-e209" name="Muharib-class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="3de4-55c3-cdea-4ad3" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="5a12-a4d5-6605-e4fc" name="Nasr Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="974a-f0eb-bd30-2aea" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="7d37-254f-77fb-45e7" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="dd46-cb11-0eb6-ea9e" type="max"/>
@@ -820,9 +629,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="6035-48eb-3f03-e366" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink name="Aronnax-class" hidden="false" id="3149-72b7-bb27-3584" targetId="e7b7-c408-f86d-191f" primary="false">
+        <categoryLink name="Titan-clas" hidden="false" id="7b2f-933f-fd62-57e3" targetId="63d9-de30-71f7-b539" type="category">
           <constraints>
-            <constraint type="max" value="1" field="selections" scope="force" shared="false" id="70b0-a558-351e-1c56" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+            <constraint type="max" value="1" field="selections" scope="force" shared="false" id="db6a-4f4f-16ac-6490" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
           </constraints>
         </categoryLink>
       </categoryLinks>
@@ -830,9 +639,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
     <forceEntry id="e7b4-36aa-bd2e-35e0" name="Order Frontline Battlefleet (Spec)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <modifiers>
         <modifier type="set" field="95ac-cd0a-aaf5-a8c3" value="1">
-          <conditions>
-            <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="atLeast"/>
-          </conditions>
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
@@ -840,15 +646,8 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="atLeast"/>
                 <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="atLeast"/>
                 <condition field="forces" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="set" field="95ac-cd0a-aaf5-a8c3" value="10">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="298e-e364-7701-8899" type="atLeast"/>
+                <condition type="atLeast" value="1" field="forces" scope="roster" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="atLeast" value="1" field="selections" scope="roster" childId="298e-e364-7701-8899" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="true"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -888,16 +687,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="2" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="50b1-70d0-8109-7e71" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="1dcb-570f-78d6-84c9" name="Carolus Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="23ac-8180-4b27-ea3b" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="572f-5cb6-1136-1a68" name="Chaska Class" hidden="false" targetId="24ab-770a-d79c-a2e2" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="13d7-c30a-be6e-73eb" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="6151-e95b-3186-36ab" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="6b0e-3a0c-428d-989f" type="max"/>
@@ -913,11 +702,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="1bcb-f745-8964-579f" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="a8e1-7167-7f29-9d1c" name="Lesath Class" hidden="false" targetId="a040-9146-93db-1474" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="4d10-3a0a-aa97-0bb4" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="47bb-41f2-155c-53c7" name="Main Battlefleet" hidden="false" targetId="f56a-3df4-17d2-db01" primary="false">
           <modifiers>
             <modifier type="set" field="e252-92a4-30e7-f0e7" value="1">
@@ -945,7 +729,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
               <conditionGroups>
                 <conditionGroup type="or">
                   <conditions>
-                    <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f570-8d39-8d98-7837" type="atLeast"/>
+                    <condition field="selections" scope="roster" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="298e-e364-7701-8899" type="atLeast"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
@@ -955,11 +739,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="1c77-ad5f-a0b8-007d" type="min"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="ce27-1e4a-8a42-993e" name="Qualor-class" hidden="false" targetId="0824-773a-ce93-7eb9" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="c0a5-1e40-d933-61f2" type="max"/>
-          </constraints>
-        </categoryLink>
       </categoryLinks>
     </forceEntry>
     <forceEntry id="4c83-75fd-df38-a6fd" name="Sultanate Fortification Battlefleet (Spec)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
@@ -1002,17 +781,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="5aaf-a758-dd62-c4fc" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="6a1e-9f1f-001e-fc74" name="Benghazi Class" hidden="false" targetId="f5cc-3fc4-01c4-20c0" primary="false">
+        <categoryLink id="6a1e-9f1f-001e-fc74" name="Benghazi-Class" hidden="false" targetId="f5cc-3fc4-01c4-20c0" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="3323-1377-5589-fbe5" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="88a1-8ccd-3ccd-5523" name="Jebel Class" hidden="false" targetId="2299-2547-ad8f-b67f" primary="false">
+        <categoryLink id="88a1-8ccd-3ccd-5523" name="Jebel-Class" hidden="false" targetId="2299-2547-ad8f-b67f" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="b65c-dae5-5ccc-cf7a" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="2c01-4ac3-a7a3-fc05" name="Khoms Class" hidden="false" targetId="c257-ce33-7deb-b335" primary="false">
+        <categoryLink id="2c01-4ac3-a7a3-fc05" name="Khoms-Class" hidden="false" targetId="c257-ce33-7deb-b335" primary="false">
           <modifiers>
             <modifier type="set" field="5f30-cd96-d53f-3b1e" value="2">
               <conditions>
@@ -1048,7 +827,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <constraint field="forces" scope="roster" value="0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="388a-5996-8126-01be" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="09c1-a49b-d93e-dcc2" name="Strategic Reserve [3.07a]" hidden="false" targetId="3f21-1511-2bff-8d3b" type="rule"/>
+        <infoLink id="09c1-a49b-d93e-dcc2" name="Sabre Rattle [3.06a]" hidden="false" targetId="6682-4372-1977-72dc" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="b548-aabe-3f0e-f65d" name="Fleet Abilities" hidden="false" targetId="dfe9-b90a-3878-78f5" primary="false"/>
@@ -1064,27 +843,27 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="force" value="4" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7f17-7922-4add-3cf6" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="198d-6fe6-8653-9ed6" name="Alsaqr Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false">
+        <categoryLink id="198d-6fe6-8653-9ed6" name="Alsaqr-Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="949a-4af5-b02b-1a25" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="8c08-8733-0f06-6701" name="Awsbiri Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false">
+        <categoryLink id="8c08-8733-0f06-6701" name="Awsbiri-Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="9c8a-8df8-b7ba-b623" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="ba9a-331c-2ecd-682e" name="Hırka Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false">
+        <categoryLink id="ba9a-331c-2ecd-682e" name="Hırka-Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="2528-3a3c-82c2-18b8" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="cead-1f78-b8f3-6f1c" name="Muharib-class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false">
+        <categoryLink id="cead-1f78-b8f3-6f1c" name="Muharib-Class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e380-f6ea-cadf-6442" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="0d14-74c1-954b-6ac3" name="Nasr Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false">
+        <categoryLink id="0d14-74c1-954b-6ac3" name="Nasr-Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b2aa-f4d5-b5d2-526c" type="max"/>
           </constraints>
@@ -1108,30 +887,15 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
     </forceEntry>
   </forceEntries>
   <selectionEntries>
-    <selectionEntry id="a9b1-4521-78af-c87a" name="Anatolia Heavy Battlecruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="a9b1-4521-78af-c87a" name="Anatolia Heavy Battlecruiser" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1139,11 +903,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </modifiers>
       <categoryLinks>
         <categoryLink id="bc4e-1b58-6f56-726b" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="60aa-e461-febf-f1b7" name="Anatolia Class" hidden="false" targetId="2531-ebd1-9648-a26f" primary="false"/>
+        <categoryLink id="60aa-e461-febf-f1b7" name="Anatolia-Class" hidden="false" targetId="2531-ebd1-9648-a26f" primary="false"/>
         <categoryLink id="30ad-7e00-6096-fe2f" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="1598-112b-a1df-efcc" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="1598-112b-a1df-efcc" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ae6b-adbc-843a-4945" type="max"/>
           </constraints>
@@ -1153,50 +917,35 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="96f1-c815-ca5c-214f" name="Anatolia" hidden="false" collective="false" import="true" targetId="6232-5259-8dac-b864" type="selectionEntry"/>
-        <entryLink id="9dd4-033b-c1d6-88e8" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="96f1-c815-ca5c-214f" name="Anatolia" hidden="false" collective="false" import="true" targetId="6232-5259-8dac-b864" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="9dd4-033b-c1d6-88e8" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="9242-3ccc-223d-a631" name="Hurrem Grand Cruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="9242-3ccc-223d-a631" name="Hurrem Grand Cruiser" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="fd2a-9d83-b348-b57e" name="Hurrem Class" hidden="false" targetId="e8d0-17bb-5709-2709" primary="false"/>
+        <categoryLink id="fd2a-9d83-b348-b57e" name="Hurrem-Class" hidden="false" targetId="e8d0-17bb-5709-2709" primary="false"/>
         <categoryLink id="6af6-e772-fe53-1748" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="0683-7cb9-e649-7686" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="79a4-1f24-8ca2-bb97" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="79a4-1f24-8ca2-bb97" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8894-dc48-e925-2158" type="max"/>
           </constraints>
@@ -1210,38 +959,23 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="9ab8-7b85-bb92-2663" name="Hurrem" hidden="false" collective="false" import="true" targetId="19a7-a50f-3486-1b08" type="selectionEntry"/>
-        <entryLink id="fd4e-6e64-645d-2098" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="9ab8-7b85-bb92-2663" name="Hurrem" hidden="false" collective="false" import="true" targetId="19a7-a50f-3486-1b08" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="fd4e-6e64-645d-2098" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="bd9b-388b-29d8-e983" name="Suleiman Fleet Carrier" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="bd9b-388b-29d8-e983" name="Suleiman Fleet Carrier" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1253,9 +987,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="afc4-2dd1-65ac-7733" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="5beb-6ee8-d423-3974" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="5beb-6ee8-d423-3974" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fe75-2301-20a8-7888" type="max"/>
+            <constraint field="selections" scope="parent" value="4" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fe75-2301-20a8-7888" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="964b-ad3d-4cb7-f3be" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -1263,34 +997,28 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="9db5-7d26-d591-385e" name="Suleiman" hidden="false" collective="false" import="true" targetId="0caf-b349-d148-8167" type="selectionEntry"/>
-        <entryLink id="b4f0-8670-1550-f8b8" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="9db5-7d26-d591-385e" name="Suleiman" hidden="false" collective="false" import="true" targetId="0caf-b349-d148-8167" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="b4f0-8670-1550-f8b8" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="7967-f7c5-8781-fbab" name="Carolus Destroyer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="7967-f7c5-8781-fbab" name="Carolus Destroyer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="e7b4-36aa-bd2e-35e0" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="0346-3aa3-3ce0-c875" name="Carolus Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false"/>
+        <categoryLink id="0346-3aa3-3ce0-c875" name="Carolus-Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false"/>
         <categoryLink id="b87b-c2da-c321-1b12" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="445a-bf90-02a3-47b0" name="Order" hidden="false" targetId="0982-cae3-3850-722a" primary="false"/>
       </categoryLinks>
@@ -1301,24 +1029,33 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="4" field="selections" scope="force" shared="false" id="ea84-bcc8-bc47-4fda" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="2762-9878-b56c-3a67" name="Hashashin Fast Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="2762-9878-b56c-3a67" name="Hashashin Fast Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="set" value="4" field="719a-c623-4cc6-16e9">
+          <conditions>
+            <condition type="instanceOf" value="1" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="05e1-dbdf-19b9-6862" name="Hashashin Class" hidden="false" targetId="739a-f65a-92e7-ad8a" primary="false"/>
+        <categoryLink id="05e1-dbdf-19b9-6862" name="Hashashin-Class" hidden="false" targetId="739a-f65a-92e7-ad8a" primary="false"/>
         <categoryLink id="f587-6e46-8bc7-d722" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="true"/>
         <categoryLink id="a015-f62d-0c09-e52f" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
       </categoryLinks>
@@ -1343,31 +1080,46 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="719a-c623-4cc6-16e9" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="e1f5-014f-f489-c9a6" name="Iskandar Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="e1f5-014f-f489-c9a6" name="Iskandar Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="5168-c9cb-b35e-2c4d" name="Iskandar Class" hidden="false" targetId="6a18-ecc8-6c5b-fc1a" primary="false"/>
+        <categoryLink id="5168-c9cb-b35e-2c4d" name="Iskandar-Class" hidden="false" targetId="6a18-ecc8-6c5b-fc1a" primary="false"/>
         <categoryLink id="7170-8e9a-9be7-aec2" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="6aa1-4a72-42c1-03c7" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="c56b-c42d-b1fd-10c3" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="c56b-c42d-b1fd-10c3" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5b9c-1b28-b96a-e214" type="max"/>
+            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5b9c-1b28-b96a-e214" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="3f9e-a26e-dbbb-11d9" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
@@ -1379,36 +1131,51 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="b654-7812-43cc-dc2a" name="Iskandar" hidden="false" collective="false" import="true" targetId="6af8-1c98-6556-7bbd" type="selectionEntry"/>
-        <entryLink id="3f4c-fbb3-bc1b-86e1" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="b654-7812-43cc-dc2a" name="Iskandar" hidden="false" collective="false" import="true" targetId="6af8-1c98-6556-7bbd" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="3f4c-fbb3-bc1b-86e1" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="f6bc-4b74-3d06-b3bb" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="086e-424e-545c-363e" name="Mehmed Grand Monitor" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="086e-424e-545c-363e" name="Mehmed Grand Monitor" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-      </modifiers>
-      <categoryLinks>
-        <categoryLink id="0208-034e-708e-1c74" name="Mehmed Class" hidden="false" targetId="30d4-a502-0c25-e14d" primary="false"/>
-        <categoryLink id="1d95-07a2-204e-64f0" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <categoryLinks>
+        <categoryLink id="0208-034e-708e-1c74" name="Mehmed-Class" hidden="false" targetId="30d4-a502-0c25-e14d" primary="false"/>
+        <categoryLink id="1d95-07a2-204e-64f0" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="45d3-e443-fb44-1f29" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="2280-97ae-1ee9-0b85" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="2280-97ae-1ee9-0b85" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9e75-22ab-a6bc-4f95" type="max"/>
           </constraints>
@@ -1418,36 +1185,51 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="9e0f-7148-8025-d797" name="Mehmed" hidden="false" collective="false" import="true" targetId="ebc9-c038-35ba-6b4e" type="selectionEntry"/>
-        <entryLink id="98d9-19fa-bc28-83cb" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="9e0f-7148-8025-d797" name="Mehmed" hidden="false" collective="false" import="true" targetId="ebc9-c038-35ba-6b4e" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="98d9-19fa-bc28-83cb" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="1115-abaa-1a57-5e4d" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="8ba9-e165-b5ec-57ee" name="Temir Frigate Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="8ba9-e165-b5ec-57ee" name="Temir Frigate Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="a0c4-7c6d-3a40-b8d5" name="Temir Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false"/>
+        <categoryLink id="a0c4-7c6d-3a40-b8d5" name="Temir-Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false"/>
         <categoryLink id="ef44-c970-d52a-1a9f" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="8c69-d483-6435-44df" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="34c1-e8b8-fb94-e223" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="34c1-e8b8-fb94-e223" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6044-9d2c-16e1-54c1" type="max"/>
           </constraints>
@@ -1461,37 +1243,51 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="7128-6189-c198-5eec" name="Temir" hidden="false" collective="false" import="true" targetId="e3df-1720-fdc8-abb4" type="selectionEntry"/>
+        <entryLink id="7128-6189-c198-5eec" name="Temir" hidden="false" collective="false" import="true" targetId="e3df-1720-fdc8-abb4" type="selectionEntry" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="68ff-b7ec-48b7-def3" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="be4c-f637-3fe7-f6ce" name="Aydin Supply Ship" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="be4c-f637-3fe7-f6ce" name="Aydin Supply Ship" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="e0b1-3c68-2d07-36b7" name="Aydin Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false"/>
+        <categoryLink id="e0b1-3c68-2d07-36b7" name="Aydin-Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false"/>
         <categoryLink id="83c1-1bd1-67e5-3535" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="940f-3fb4-9c1c-7c91" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="3e27-bca3-480d-04e2" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="3e27-bca3-480d-04e2" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5e41-fa1d-1e32-2326" type="max"/>
+            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5e41-fa1d-1e32-2326" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="79ee-4430-c4cb-2747" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -1499,37 +1295,52 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="7af2-c526-34eb-4504" name="Aydin" hidden="false" collective="false" import="true" targetId="eec4-fb90-1ff0-1e4c" type="selectionEntry"/>
+        <entryLink id="7af2-c526-34eb-4504" name="Aydin" hidden="false" collective="false" import="true" targetId="eec4-fb90-1ff0-1e4c" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="6377-c3ed-1477-1c3f" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="3d87-6f73-1507-6a82" name="Constantinople Support Carrier Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="3d87-6f73-1507-6a82" name="Constantinople Support Carrier Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="344c-6173-1152-d051" name="Constantinople Class" hidden="false" targetId="8d86-1a93-a17b-bbab" primary="false"/>
+        <categoryLink id="344c-6173-1152-d051" name="Constantinople-Class" hidden="false" targetId="8d86-1a93-a17b-bbab" primary="false"/>
         <categoryLink id="a75a-de7f-7ce6-bc18" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="f3bd-f704-7646-1e0f" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="f450-f003-d6c0-15d3" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="f450-f003-d6c0-15d3" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="39e8-580f-d00a-6ebe" type="max"/>
+            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="39e8-580f-d00a-6ebe" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="5107-e5cb-4cc0-3731" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
@@ -1541,38 +1352,53 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="7944-2956-ca78-d5bf" name="Constantinople" hidden="false" collective="false" import="true" targetId="9378-5dd7-8ea9-cb24" type="selectionEntry"/>
-        <entryLink id="e69c-ec5d-290c-250e" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="7944-2956-ca78-d5bf" name="Constantinople" hidden="false" collective="false" import="true" targetId="9378-5dd7-8ea9-cb24" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="e69c-ec5d-290c-250e" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="1bf2-d02b-c3d3-5a97" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="6485-551a-ac3b-a757" name="Izmir Monitor Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="6485-551a-ac3b-a757" name="Izmir Monitor Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="142f-3e0b-c991-76f4" name="Izmir Class" hidden="false" targetId="19b7-401e-32b1-9bab" primary="false"/>
+        <categoryLink id="142f-3e0b-c991-76f4" name="Izmir-Class" hidden="false" targetId="19b7-401e-32b1-9bab" primary="false"/>
         <categoryLink id="e5c8-68cd-5cee-0746" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="7095-458a-e7a6-ed2f" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="3045-28af-f12a-7b6b" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="3045-28af-f12a-7b6b" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bcdb-fc15-337c-8b9a" type="max"/>
+            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bcdb-fc15-337c-8b9a" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="c2dd-5373-bd79-f6d4" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
@@ -1584,38 +1410,53 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="e964-53ab-7560-9e62" name="Izmir" hidden="false" collective="false" import="true" targetId="dad1-a5fe-6d40-973f" type="selectionEntry"/>
-        <entryLink id="fcec-72b5-9333-54c4" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="e964-53ab-7560-9e62" name="Izmir" hidden="false" collective="false" import="true" targetId="dad1-a5fe-6d40-973f" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="fcec-72b5-9333-54c4" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="aca8-06d3-d94c-9bcc" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="ccf4-e047-cc90-8ecc" name="Mihrimah Bombardment Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="ccf4-e047-cc90-8ecc" name="Mihrimah Bombardment Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="8bb8-dfff-edad-d7f5" name="Mihrimah Class" hidden="false" targetId="ee25-ef25-c9fe-b811" primary="false"/>
+        <categoryLink id="8bb8-dfff-edad-d7f5" name="Mihrimah-Class" hidden="false" targetId="ee25-ef25-c9fe-b811" primary="false"/>
         <categoryLink id="d17b-582a-eb60-02c0" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="5269-e005-bc46-5e37" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="a04d-92eb-dba3-3873" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="a04d-92eb-dba3-3873" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="aeb3-198e-8485-ec29" type="max"/>
+            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="aeb3-198e-8485-ec29" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="7d71-89f8-17b2-d8f2" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -1623,36 +1464,51 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="e73c-7321-e511-6639" name="Mihrimah" hidden="false" collective="false" import="true" targetId="d0b1-3cde-8007-8794" type="selectionEntry"/>
-        <entryLink id="f522-c818-e16c-344f" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="e73c-7321-e511-6639" name="Mihrimah" hidden="false" collective="false" import="true" targetId="d0b1-3cde-8007-8794" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="f522-c818-e16c-344f" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="cd9a-35eb-1675-8b40" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="2a7a-f6bf-b780-896d" name="Pasha Light Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="2a7a-f6bf-b780-896d" name="Pasha Light Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="05b2-2d53-da44-fc65" name="Pasha Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false"/>
+        <categoryLink id="05b2-2d53-da44-fc65" name="Pasha-Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false"/>
         <categoryLink id="4fc9-7a45-6c9b-300a" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="7ee2-e401-f25b-3225" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="e405-9e00-2905-f78d" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="e405-9e00-2905-f78d" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2c5c-af80-320b-a397" type="max"/>
           </constraints>
@@ -1666,37 +1522,52 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="79fa-80d7-7fa3-c8dc" name="Pasha" hidden="false" collective="false" import="true" targetId="d405-4ee8-bca7-6cfd" type="selectionEntry"/>
+        <entryLink id="79fa-80d7-7fa3-c8dc" name="Pasha" hidden="false" collective="false" import="true" targetId="d405-4ee8-bca7-6cfd" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="fe18-e10b-8ccf-6912" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="068f-c61b-9811-d085" name="Sadrazam Heavy Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="068f-c61b-9811-d085" name="Sadrazam Heavy Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="e832-fc61-53ad-314b" name="Sadrazam Class" hidden="false" targetId="9da6-652d-beb4-f5c0" primary="false"/>
+        <categoryLink id="e832-fc61-53ad-314b" name="Sadrazam-Class" hidden="false" targetId="9da6-652d-beb4-f5c0" primary="false"/>
         <categoryLink id="2d86-decb-46a4-8250" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="2ae3-3bb3-a01a-7e26" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="83d0-6cdc-9973-0f10" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="83d0-6cdc-9973-0f10" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8c8a-beb9-1a43-282f" type="max"/>
+            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8c8a-beb9-1a43-282f" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="9cb3-a707-b55b-e0fb" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
@@ -1708,36 +1579,51 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="74c7-e393-ad69-12be" name="Sadrazam" hidden="false" collective="false" import="true" targetId="2adf-49f2-e750-becd" type="selectionEntry"/>
-        <entryLink id="6d97-9ce1-453a-cb12" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="74c7-e393-ad69-12be" name="Sadrazam" hidden="false" collective="false" import="true" targetId="2adf-49f2-e750-becd" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="6d97-9ce1-453a-cb12" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="edd6-0e84-4648-5e58" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="4d0b-afa9-7cc3-7dec" name="Nemrut Supremacy Cruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="4d0b-afa9-7cc3-7dec" name="Nemrut Supremacy Cruiser" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="fade-9c9c-b375-5a75" name="Nemrut Class" hidden="false" targetId="2b7c-78f2-2a5a-716a" primary="false"/>
+        <categoryLink id="fade-9c9c-b375-5a75" name="Nemrut-Class" hidden="false" targetId="2b7c-78f2-2a5a-716a" primary="false"/>
         <categoryLink id="4f32-5bc0-b4df-aaa7" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="6627-acdb-921d-b2d8" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="9c0b-4d5f-ef6c-68c0" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="9c0b-4d5f-ef6c-68c0" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9b9b-25d2-233f-0d18" type="max"/>
           </constraints>
@@ -1751,38 +1637,53 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="ccc9-8b59-6746-1f8c" name="Nemrut" hidden="false" collective="false" import="true" targetId="e158-808d-002d-9606" type="selectionEntry"/>
-        <entryLink id="7a2e-346f-b3f0-9c39" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="ccc9-8b59-6746-1f8c" name="Nemrut" hidden="false" collective="false" import="true" targetId="e158-808d-002d-9606" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="7a2e-346f-b3f0-9c39" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="d389-7617-5efb-78a8" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="e9e1-3c5d-9b67-ca21" name="Morea Minelayer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="e9e1-3c5d-9b67-ca21" name="Morea Minelayer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="a990-6cb8-2d4b-5264" name="Morea Class" hidden="false" targetId="94b0-937f-c25a-a56d" primary="false"/>
+        <categoryLink id="a990-6cb8-2d4b-5264" name="Morea-Class" hidden="false" targetId="94b0-937f-c25a-a56d" primary="false"/>
         <categoryLink id="249f-4366-73e5-6fa1" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="c6e2-1699-41a8-b6ca" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="5895-4d0d-9b2b-9b7c" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="5895-4d0d-9b2b-9b7c" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f908-6adf-4338-c4b9" type="max"/>
+            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f908-6adf-4338-c4b9" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="eb4f-c275-6f20-c219" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
@@ -1794,38 +1695,25 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="8683-e964-0d94-2dba" name="Morea" hidden="false" collective="false" import="true" targetId="e886-b4b1-b50d-bd52" type="selectionEntry"/>
-        <entryLink id="ae41-b859-14b0-fec8" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="8683-e964-0d94-2dba" name="Morea" hidden="false" collective="false" import="true" targetId="e886-b4b1-b50d-bd52" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="ae41-b859-14b0-fec8" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="0932-a72f-f182-285d" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="01b5-e15f-2568-da31" name="Abydos Hover Stronghold" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="01b5-e15f-2568-da31" name="Abydos Hover Stronghold" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" field="hidden" value="false">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1833,11 +1721,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </modifiers>
       <categoryLinks>
         <categoryLink id="0e07-b2e8-fc96-3ebb" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="4945-c074-c771-00ee" name="Abydos Class" hidden="false" targetId="bea8-bec2-c077-ecea" primary="false"/>
+        <categoryLink id="4945-c074-c771-00ee" name="Abydos-Class" hidden="false" targetId="bea8-bec2-c077-ecea" primary="false"/>
         <categoryLink id="38ce-df9c-613e-14e7" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="3af6-315f-cafb-2f79" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="3af6-315f-cafb-2f79" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="51d2-b8a7-7c9a-864e" type="max"/>
           </constraints>
@@ -1860,27 +1748,20 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="c202-9d1c-2079-ad05" name="Abydos" hidden="false" collective="false" import="true" targetId="6423-a3d3-2b2c-f811" type="selectionEntry"/>
+        <entryLink id="c202-9d1c-2079-ad05" name="Abydos" hidden="false" collective="false" import="true" targetId="6423-a3d3-2b2c-f811" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="32b7-8a5e-1b8e-db3a" name="Retaj Portalship" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="32b7-8a5e-1b8e-db3a" name="Retaj Portalship" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="e7b4-36aa-bd2e-35e0" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1888,18 +1769,18 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </modifiers>
       <categoryLinks>
         <categoryLink id="0502-a405-df44-484f" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="d248-6133-4c82-1a4e" name="Retaj Class" hidden="false" targetId="3d94-794c-7ebc-7074" primary="false"/>
+        <categoryLink id="d248-6133-4c82-1a4e" name="Retaj-Class" hidden="false" targetId="3d94-794c-7ebc-7074" primary="false"/>
         <categoryLink id="4a6b-7744-803a-eec6" name="Order" hidden="false" targetId="0982-cae3-3850-722a" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="6aa7-b076-fdca-6678" name="Attached Unit [Order]" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="6aa7-b076-fdca-6678" name="Attached Unit [Order]" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="182c-1d91-fdc0-f72c" type="max"/>
           </constraints>
           <selectionEntries>
             <selectionEntry id="587b-1b6b-474a-0575" name="Carolus Destroyer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
               <categoryLinks>
-                <categoryLink id="aef4-08bd-9553-c5a1" name="Carolus Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false"/>
+                <categoryLink id="aef4-08bd-9553-c5a1" name="Carolus-Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false"/>
                 <categoryLink id="902a-8c1f-3bdf-a689" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
                 <categoryLink id="28c5-7e0c-2daf-96e3" name="Order" hidden="false" targetId="0982-cae3-3850-722a" primary="false"/>
               </categoryLinks>
@@ -1919,37 +1800,22 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="253b-ccd9-7001-c8c7" name="Retaj" hidden="false" collective="false" import="true" targetId="5f97-b312-cfd4-64e6" type="selectionEntry"/>
+        <entryLink id="253b-ccd9-7001-c8c7" name="Retaj" hidden="false" collective="false" import="true" targetId="5f97-b312-cfd4-64e6" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="c5b4-d0b2-9813-a7ab" name="Topkapi Portal-Strike Carrier" publicationId="d854-a2d6-3d52-44c4" page="12" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="c5b4-d0b2-9813-a7ab" name="Topkapi Portal-Strike Carrier" publicationId="d854-a2d6-3d52-44c4" page="12" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1957,11 +1823,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </modifiers>
       <categoryLinks>
         <categoryLink id="8614-f8cb-b8a8-7d9f" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="2c64-95bd-fb4a-687d" name="Topkapi Class" hidden="false" targetId="61e5-e314-c2bd-c0ec" primary="false"/>
+        <categoryLink id="2c64-95bd-fb4a-687d" name="Topkapi-Class" hidden="false" targetId="61e5-e314-c2bd-c0ec" primary="false"/>
         <categoryLink id="3eb1-72c4-4de4-0d9e" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="d48f-3dc0-45da-c644" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="d48f-3dc0-45da-c644" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c9cd-10ac-b6ac-d38f" type="max"/>
           </constraints>
@@ -1971,36 +1837,47 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="7ba1-0956-6711-81d2" name="Topkapi" hidden="false" collective="false" import="true" targetId="3cd7-70f1-38c1-4e58" type="selectionEntry"/>
-        <entryLink id="ba92-5419-663c-2b4b" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="7ba1-0956-6711-81d2" name="Topkapi" hidden="false" collective="false" import="true" targetId="3cd7-70f1-38c1-4e58" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="ba92-5419-663c-2b4b" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="8010-8307-c215-e06c" name="Bayezid Ikili Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="8010-8307-c215-e06c" name="Bayezid Ikili Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="3ad0-3d66-ae95-3dff" name="Bayezid Class" hidden="false" targetId="a974-e10e-3d35-30fe" primary="false"/>
         <categoryLink id="6bf5-fd4c-a7a7-2ecc" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
-        <categoryLink id="38f6-29f4-5e65-f1b0" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
+        <categoryLink name="Bayezid-Class" hidden="false" id="a842-8ba1-6e18-1107" targetId="a974-e10e-3d35-30fe" primary="false"/>
+        <categoryLink name="Turkish" hidden="false" id="1cb3-5a05-e828-4cfa" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="86ef-cdee-393b-1873" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="86ef-cdee-393b-1873" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6c8c-21ca-ae00-bb95" type="max"/>
           </constraints>
@@ -2010,37 +1887,37 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="28a8-5ca7-3f19-d061" name="Bayezid" hidden="false" collective="false" import="true" targetId="187a-b0b4-1905-a838" type="selectionEntry"/>
-        <entryLink id="a2c7-932f-ecb4-bdfa" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="28a8-5ca7-3f19-d061" name="Bayezid" hidden="false" collective="false" import="true" targetId="187a-b0b4-1905-a838" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="a2c7-932f-ecb4-bdfa" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="6eaa-2063-abe3-7561" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="94bf-b3ab-22a9-aa91" name="Benghazi Offshore Support Platforms" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="94bf-b3ab-22a9-aa91" name="Benghazi Offshore Support Platforms" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="4c83-75fd-df38-a6fd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="af09-8785-73fb-96bf" name="Benghazi Class" hidden="false" targetId="f5cc-3fc4-01c4-20c0" primary="false"/>
+        <categoryLink id="af09-8785-73fb-96bf" name="Benghazi-Class" hidden="false" targetId="f5cc-3fc4-01c4-20c0" primary="false"/>
         <categoryLink id="6c5a-711f-2119-d8ca" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="e564-c7c4-313b-83e2" name="Tripolitanian" hidden="false" targetId="6a30-e049-f4d0-67f5" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="5308-4d7a-feb2-8ac4" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="5308-4d7a-feb2-8ac4" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="76c6-1f41-bf5a-d08e" type="max"/>
           </constraints>
@@ -2050,36 +1927,51 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="414b-ca02-80be-6949" name="Benghazi" hidden="false" collective="false" import="true" targetId="b47d-971e-b3e4-588b" type="selectionEntry"/>
-        <entryLink id="f9fa-3874-3629-9f80" name="Attached Unit [Tripolitanian]" hidden="false" collective="false" import="true" targetId="675c-7ca1-bd20-962d" type="selectionEntryGroup"/>
+        <entryLink id="414b-ca02-80be-6949" name="Benghazi" hidden="false" collective="false" import="true" targetId="b47d-971e-b3e4-588b" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="f9fa-3874-3629-9f80" name="Attached Unit [Tripolitanian]" hidden="false" collective="false" import="true" targetId="675c-7ca1-bd20-962d" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="99e6-100d-79de-6d4c" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="f40f-46b7-31ab-870f" name="Bursa Ikili Heavy Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="f40f-46b7-31ab-870f" name="Bursa Ikili Heavy Cruiser Squadron" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="e2bf-0cca-aff4-8b12" name="Bursa Class" hidden="false" targetId="2bb9-b056-8541-bce3" primary="false"/>
+        <categoryLink id="e2bf-0cca-aff4-8b12" name="Bursa-Class" hidden="false" targetId="2bb9-b056-8541-bce3" primary="false"/>
         <categoryLink id="d025-8667-5ce8-14b5" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="88de-873f-e4ef-78db" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="bae6-817c-a6db-f6a7" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="bae6-817c-a6db-f6a7" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9139-38c7-f9a4-7fad" type="max"/>
           </constraints>
@@ -2089,37 +1981,42 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="e36b-ba65-208b-0e87" name="Bursa" hidden="false" collective="false" import="true" targetId="525d-2b73-2575-b137" type="selectionEntry"/>
-        <entryLink id="c088-ca7a-6cb6-de46" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="e36b-ba65-208b-0e87" name="Bursa" hidden="false" collective="false" import="true" targetId="525d-2b73-2575-b137" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="c088-ca7a-6cb6-de46" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="bba9-31fa-cd38-32e4" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="9c61-85fd-a7de-47d1" name="Jebel Battle Platforms" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="9c61-85fd-a7de-47d1" name="Jebel Battle Platforms" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="4c83-75fd-df38-a6fd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="set" value="4" field="ba90-4615-9b79-f8dd">
+          <conditions>
+            <condition type="instanceOf" value="1" field="selections" scope="force" childId="4c83-75fd-df38-a6fd" shared="true"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="c624-1fa0-b633-4d5c" name="Jebel Class" hidden="false" targetId="2299-2547-ad8f-b67f" primary="false"/>
+        <categoryLink id="c624-1fa0-b633-4d5c" name="Jebel-Class" hidden="false" targetId="2299-2547-ad8f-b67f" primary="false"/>
         <categoryLink id="a684-3ec3-0101-375d" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="3911-0711-ea0e-aa89" name="Tripolitanian" hidden="false" targetId="6a30-e049-f4d0-67f5" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="6a89-3441-12bb-231f" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="6a89-3441-12bb-231f" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e19b-71a5-807c-406e" type="max"/>
           </constraints>
@@ -2129,38 +2026,38 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="d3c5-3e2c-6700-a629" name="Jebel" hidden="false" collective="false" import="true" targetId="2a1d-b7e0-198d-61a4" type="selectionEntry"/>
+        <entryLink id="d3c5-3e2c-6700-a629" name="Jebel" hidden="false" collective="false" import="true" targetId="2a1d-b7e0-198d-61a4" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="ba90-4615-9b79-f8dd" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="0379-5fff-75bc-f044" name="Khoms Heavy Platform" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="0379-5fff-75bc-f044" name="Khoms Heavy Platform" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="4c83-75fd-df38-a6fd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="256c-62b2-213d-d73d" name="Khoms Class" hidden="false" targetId="c257-ce33-7deb-b335" primary="false"/>
+        <categoryLink id="256c-62b2-213d-d73d" name="Khoms-Class" hidden="false" targetId="c257-ce33-7deb-b335" primary="false"/>
         <categoryLink id="2214-51db-e6d5-2be3" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="8bbd-3f21-c487-a780" name="Tripolitanian" hidden="false" targetId="6a30-e049-f4d0-67f5" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="95de-bc62-fdeb-d98a" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="95de-bc62-fdeb-d98a" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b004-3c26-edd3-e33a" type="max"/>
+            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b004-3c26-edd3-e33a" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="8e76-84ef-a6ea-a47d" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -2168,31 +2065,46 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="d8b0-731a-dcf7-4603" name="Khoms" hidden="false" collective="false" import="true" targetId="96e6-17bb-ae04-3710" type="selectionEntry"/>
-        <entryLink id="e0a1-bd9d-fb05-a311" name="Attached Unit [Tripolitanian]" hidden="false" collective="false" import="true" targetId="675c-7ca1-bd20-962d" type="selectionEntryGroup"/>
+        <entryLink id="d8b0-731a-dcf7-4603" name="Khoms" hidden="false" collective="false" import="true" targetId="96e6-17bb-ae04-3710" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="e0a1-bd9d-fb05-a311" name="Attached Unit [Tripolitanian]" hidden="false" collective="false" import="true" targetId="675c-7ca1-bd20-962d" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="aaa9-460e-a760-e86b" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="ad80-cae8-c2ec-e53f" name="Konya Mainteinance Ship" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="ad80-cae8-c2ec-e53f" name="Konya Mainteinance Ship" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="9abc-c300-02de-2fa6" name="Konya Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false"/>
+        <categoryLink id="9abc-c300-02de-2fa6" name="Konya-Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false"/>
         <categoryLink id="58a1-65b6-4496-34b7" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="11d9-70dd-5c28-db4a" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
@@ -2218,24 +2130,28 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="1686-1004-0553-724f" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="d72f-4d4b-e248-102b" name="Kopesh Scout Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="d72f-4d4b-e248-102b" name="Kopesh Scout Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="1934-ad3e-c28e-8c2d" name="Kopesh Class" hidden="false" targetId="0c76-eeb9-34fe-c074" primary="false"/>
+        <categoryLink id="1934-ad3e-c28e-8c2d" name="Kopesh-Class" hidden="false" targetId="0c76-eeb9-34fe-c074" primary="false"/>
         <categoryLink id="a926-b326-6bec-3f8c" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="true"/>
         <categoryLink id="82aa-e039-fc75-8c4b" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
       </categoryLinks>
@@ -2260,6 +2176,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="e12c-f01a-afa3-85e9" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
     <selectionEntry id="9e0a-02f3-abf8-cd7e" name="Mandjet Heavy Skimmer Squadron" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
@@ -2270,12 +2189,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="2c08-9e11-da81-3f22" name="Mandjet Class" hidden="false" targetId="13b5-6bf3-f7bf-1a8d" primary="false"/>
+        <categoryLink id="2c08-9e11-da81-3f22" name="Mandjet-Class" hidden="false" targetId="13b5-6bf3-f7bf-1a8d" primary="false"/>
         <categoryLink id="19d9-7700-3b20-2155" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
         <categoryLink id="a720-c414-98d8-39f2" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="6ede-f52b-f02c-452c" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="6ede-f52b-f02c-452c" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8314-6120-1391-0c3b" type="max"/>
           </constraints>
@@ -2289,35 +2208,36 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="be42-9123-09cb-07ce" name="Mandjet" hidden="false" collective="false" import="true" targetId="609f-7444-a251-6f61" type="selectionEntry"/>
+        <entryLink id="be42-9123-09cb-07ce" name="Mandjet" hidden="false" collective="false" import="true" targetId="609f-7444-a251-6f61" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="fda6-eb97-0f0c-e352" name="Mesektet Strike Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="fda6-eb97-0f0c-e352" name="Mesektet Strike Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="95e1-9fa7-47ab-d46e" name="Mesektet Class" hidden="false" targetId="2d1c-adcb-c1e8-f49e" primary="false"/>
+        <categoryLink id="95e1-9fa7-47ab-d46e" name="Mesektet-Class" hidden="false" targetId="2d1c-adcb-c1e8-f49e" primary="false"/>
         <categoryLink id="13ca-4157-9c61-14d9" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="true"/>
         <categoryLink id="e7b8-f22d-7cdf-e158" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="da98-d838-e480-017a" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="da98-d838-e480-017a" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a928-c120-8cac-d89f" type="max"/>
           </constraints>
@@ -2331,35 +2251,39 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="f043-3f7f-fc31-e732" name="Mesektet" hidden="false" collective="false" import="true" targetId="af82-5b49-3185-fb4e" type="selectionEntry"/>
+        <entryLink id="f043-3f7f-fc31-e732" name="Mesektet" hidden="false" collective="false" import="true" targetId="af82-5b49-3185-fb4e" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="aea6-f933-8112-6386" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="8cde-7411-e467-74d2" name="Sabah Barrage Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="8cde-7411-e467-74d2" name="Sabah Barrage Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="7fb8-51fb-f7bb-9762" name="Sabah Class" hidden="false" targetId="d21c-0e10-c102-5456" primary="false"/>
+        <categoryLink id="7fb8-51fb-f7bb-9762" name="Sabah-Class" hidden="false" targetId="d21c-0e10-c102-5456" primary="false"/>
         <categoryLink id="7d1b-5f20-29e0-7b69" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="true"/>
         <categoryLink id="70b2-6d2b-026a-db1b" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="8f09-6da4-55a6-eace" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="8f09-6da4-55a6-eace" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4978-96cc-5b4c-d643" type="max"/>
           </constraints>
@@ -2373,35 +2297,39 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="f3f0-dbfd-8081-cb33" name="Sabah" hidden="false" collective="false" import="true" targetId="49c8-4b51-3481-235f" type="selectionEntry"/>
+        <entryLink id="f3f0-dbfd-8081-cb33" name="Sabah" hidden="false" collective="false" import="true" targetId="49c8-4b51-3481-235f" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="a9e8-cf56-fc4d-4d13" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="c83f-bc71-9ccd-bb7b" name="Sobek Monitor Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="c83f-bc71-9ccd-bb7b" name="Sobek Monitor Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="8a43-e813-406f-41a4" name="Sobek Class" hidden="false" targetId="4807-c354-a654-875b" primary="false"/>
+        <categoryLink id="8a43-e813-406f-41a4" name="Sobek-Class" hidden="false" targetId="4807-c354-a654-875b" primary="false"/>
         <categoryLink id="d525-6307-ef61-5c6c" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="true"/>
         <categoryLink id="0404-1d2a-4eb6-2f84" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="988c-f5a7-a32e-d3a1" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="988c-f5a7-a32e-d3a1" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7fd0-e3b7-744a-283e" type="max"/>
           </constraints>
@@ -2415,38 +2343,49 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="5060-ffeb-b474-c456" name="Sobek" hidden="false" collective="false" import="true" targetId="fcb1-b68b-1d9d-1565" type="selectionEntry"/>
+        <entryLink id="5060-ffeb-b474-c456" name="Sobek" hidden="false" collective="false" import="true" targetId="fcb1-b68b-1d9d-1565" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="ba5a-c80b-0410-401b" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="c643-eb6e-e377-7bb2" name="Alsaqr Skybarques Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="c643-eb6e-e377-7bb2" name="Alsaqr Skybarques Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="remove" field="category" value="03eb-089a-0c01-5751">
+          <conditions>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
+        <modifier type="set" value="2" field="2434-252c-edd5-fb5e">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="remove" field="category" value="03eb-089a-0c01-5751">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+            <condition type="instanceOf" value="1" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true"/>
           </conditions>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="b199-2ada-8f94-4fc1" name="Alsaqr Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false"/>
+        <categoryLink id="b199-2ada-8f94-4fc1" name="Alsaqr-Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false"/>
         <categoryLink id="4dce-6473-fdb6-5ee8" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
         <categoryLink id="e712-fba2-0c99-188b" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
@@ -2457,63 +2396,68 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
-    </selectionEntry>
-    <selectionEntry id="d3dd-f3ec-e6bd-0c77" name="Awsbiri Skylancer  Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
-      <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="2434-252c-edd5-fb5e" includeChildSelections="true"/>
+      </constraints>
+    </selectionEntry>
+    <selectionEntry id="d3dd-f3ec-e6bd-0c77" name="Awsbiri Skylancer  Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="remove" field="category" value="03eb-089a-0c01-5751">
           <conditions>
             <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
           </conditions>
         </modifier>
-        <modifier type="remove" field="category" value="03eb-089a-0c01-5751">
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
           </conditions>
         </modifier>
+        <modifier type="set" value="false" field="hidden">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="a093-c670-763c-9b54" name="Awsbiri Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false"/>
+        <categoryLink id="a093-c670-763c-9b54" name="Awsbiri-Class" hidden="false" targetId="1f4b-4e22-f3f5-f27b" primary="false"/>
         <categoryLink id="9029-9957-22ec-c2d6" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
         <categoryLink id="dc2d-e782-cba3-3dee" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="09a7-b790-54f5-75a1" name="Awsbiri" hidden="false" collective="false" import="true" targetId="2828-6bd3-8b4a-4556" type="selectionEntry"/>
-        <entryLink id="5491-e641-8623-ae05" name="Attached Unit [Turkish Aerial]" hidden="false" collective="false" import="true" targetId="2e7e-0328-269a-76cc" type="selectionEntryGroup"/>
+        <entryLink id="09a7-b790-54f5-75a1" name="Awsbiri" hidden="false" collective="false" import="true" targetId="2828-6bd3-8b4a-4556" type="selectionEntry" sortIndex="2"/>
+        <entryLink id="5491-e641-8623-ae05" name="Attached Unit [Turkish Aerial]" hidden="false" collective="false" import="true" targetId="2e7e-0328-269a-76cc" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="787d-c135-b6d8-ea57" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="a876-b494-f12b-8069" name="Chaska Vitruvian Colussus Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="a876-b494-f12b-8069" name="Chaska Vitruvian Colussus Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="e7b4-36aa-bd2e-35e0" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="bacf-0f11-e85d-d4dd" name="Chaska Class" hidden="false" targetId="24ab-770a-d79c-a2e2" primary="false"/>
+        <categoryLink id="bacf-0f11-e85d-d4dd" name="Chaska-Class" hidden="false" targetId="24ab-770a-d79c-a2e2" primary="false"/>
         <categoryLink id="a76c-ad7f-b68f-dc86" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
         <categoryLink id="bda1-9a6f-963b-cc2c" name="Order" hidden="false" targetId="0982-cae3-3850-722a" primary="false"/>
       </categoryLinks>
@@ -2524,32 +2468,44 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="f28c-0842-aa62-604f" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="ffd9-d460-9e9a-f76c" name="Hırka Skycutter Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="ffd9-d460-9e9a-f76c" name="Hırka Skycutter Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="remove" field="category" value="03eb-089a-0c01-5751">
+          <conditions>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
+          <conditions>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="remove" field="category" value="03eb-089a-0c01-5751">
+        <modifier type="set" value="2" field="e4df-99dc-a7f7-720c">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+            <condition type="instanceOf" value="1" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true"/>
           </conditions>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="90c6-6a04-49a4-e1fa" name="Hırka Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false"/>
+        <categoryLink id="90c6-6a04-49a4-e1fa" name="Hırka-Class" hidden="false" targetId="2c81-f9ba-2c2e-fa6a" primary="false"/>
         <categoryLink id="2929-494f-1aa2-13f9" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
         <categoryLink id="6e09-52c7-c57b-1776" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
@@ -2561,66 +2517,84 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="e4df-99dc-a7f7-720c" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="85b7-df62-f4ac-aa69" name="Nasr Skyship Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="85b7-df62-f4ac-aa69" name="Nasr Skyship Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="remove" field="category" value="03eb-089a-0c01-5751">
+          <conditions>
+            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-          </conditions>
-        </modifier>
-        <modifier type="remove" field="category" value="03eb-089a-0c01-5751">
+        <modifier type="set" value="2" field="fa1b-48c9-bbf3-691c">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+            <condition type="instanceOf" value="1" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true"/>
           </conditions>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="2049-6197-8e09-6900" name="Nasr Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false"/>
+        <categoryLink id="2049-6197-8e09-6900" name="Nasr-Class" hidden="false" targetId="112e-04bc-abc1-fd2f" primary="false"/>
         <categoryLink id="9b03-c95c-f9de-d38b" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
         <categoryLink id="af52-be43-e152-5191" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="98f2-07d3-0a47-8096" name="Nasr" hidden="false" collective="false" import="true" targetId="703c-73db-79d6-f000" type="selectionEntry"/>
-        <entryLink id="0015-eff4-cc65-4f9c" name="Attached Unit [Turkish Aerial]" hidden="false" collective="false" import="true" targetId="2e7e-0328-269a-76cc" type="selectionEntryGroup"/>
+        <entryLink id="98f2-07d3-0a47-8096" name="Nasr" hidden="false" collective="false" import="true" targetId="703c-73db-79d6-f000" type="selectionEntry" sortIndex="2"/>
+        <entryLink id="0015-eff4-cc65-4f9c" name="Attached Unit [Turkish Aerial]" hidden="false" collective="false" import="true" targetId="2e7e-0328-269a-76cc" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="fa1b-48c9-bbf3-691c" includeChildSelections="true"/>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="2fdc-2ce5-92ad-a9f3" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="6c90-24a3-9fa6-d17a" name="Mandjet Heavy Skimmer Squadron" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="6c90-24a3-9fa6-d17a" name="Mandjet Heavy Skimmer Squadron" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="4c83-75fd-df38-a6fd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="6d99-57fd-7ecc-3944" name="Mandjet Class" hidden="false" targetId="13b5-6bf3-f7bf-1a8d" primary="false"/>
+        <categoryLink id="6d99-57fd-7ecc-3944" name="Mandjet-Class" hidden="false" targetId="13b5-6bf3-f7bf-1a8d" primary="false"/>
         <categoryLink id="e479-5bcf-8d99-a8a6" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="true"/>
         <categoryLink id="2447-7f27-4cb2-aad1" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="a579-41ae-6390-fee8" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="a579-41ae-6390-fee8" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e375-e7a2-e976-bd82" type="max"/>
           </constraints>
@@ -2634,37 +2608,25 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="08dd-f7a4-5b3b-e270" name="Mandjet" hidden="false" collective="false" import="true" targetId="609f-7444-a251-6f61" type="selectionEntry"/>
+        <entryLink id="08dd-f7a4-5b3b-e270" name="Mandjet" hidden="false" collective="false" import="true" targetId="609f-7444-a251-6f61" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="964e-e977-d1e9-73bc" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="1181-fa00-9fd8-fa74" name="Dogan" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="1181-fa00-9fd8-fa74" name="Dogan" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2672,11 +2634,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </modifiers>
       <categoryLinks>
         <categoryLink id="cdd5-1fd1-5f65-8c3f" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="108f-b5c0-b8d4-e6ea" name="Anatolia Class" hidden="false" targetId="2531-ebd1-9648-a26f" primary="false"/>
+        <categoryLink id="108f-b5c0-b8d4-e6ea" name="Anatolia-Class" hidden="false" targetId="2531-ebd1-9648-a26f" primary="false"/>
         <categoryLink id="eac4-2112-3cc6-5af4" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="a34a-8277-e6f0-0786" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="a34a-8277-e6f0-0786" name="Escort" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5789-7820-717a-7b18" type="max"/>
           </constraints>
@@ -2686,38 +2648,23 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="7fd9-023b-a8b5-39c5" name="Dogan" hidden="false" collective="false" import="true" targetId="6280-7fa3-96e8-25af" type="selectionEntry"/>
-        <entryLink id="3b76-3e12-c340-4790" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup"/>
+        <entryLink id="7fd9-023b-a8b5-39c5" name="Dogan" hidden="false" collective="false" import="true" targetId="6280-7fa3-96e8-25af" type="selectionEntry" sortIndex="2"/>
+        <entryLink id="3b76-3e12-c340-4790" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="68f3-5cde-b698-cae3" name="Valide Kosem" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="68f3-5cde-b698-cae3" name="Valide Kosem" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2725,13 +2672,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </modifiers>
       <categoryLinks>
         <categoryLink id="c629-b50b-7115-e57a" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="9dc6-489c-3d6a-bd6e" name="Anatolia Class" hidden="false" targetId="2531-ebd1-9648-a26f" primary="false"/>
+        <categoryLink id="9dc6-489c-3d6a-bd6e" name="Anatolia-Class" hidden="false" targetId="2531-ebd1-9648-a26f" primary="false"/>
         <categoryLink id="d279-fb9b-302a-60f5" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="1fef-8a63-5744-a5e9" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="1fef-8a63-5744-a5e9" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3def-12ed-8d36-6011" type="max"/>
+            <constraint field="selections" scope="parent" value="4" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3def-12ed-8d36-6011" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="fafc-dc05-033e-7c70" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -2739,7 +2686,8 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="3edb-340e-9a23-3a34" name="Valide Kosem" hidden="false" collective="false" import="true" targetId="cb0d-dd6a-ccd2-ee12" type="selectionEntry"/>
+        <entryLink id="3edb-340e-9a23-3a34" name="Valide Kosem" hidden="false" collective="false" import="true" targetId="cb0d-dd6a-ccd2-ee12" type="selectionEntry" sortIndex="3"/>
+        <entryLink import="true" name="Attached Unit [Turkish Surface]" hidden="false" id="721e-08bd-0edb-a2b5" collective="false" targetId="288f-d769-8b45-c2f5" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
@@ -2747,23 +2695,10 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="8bcd-b16a-3c9e-fae1" name="Spartan Dive-Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
-      <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-      </modifiers>
       <categoryLinks>
         <categoryLink id="e8a8-2838-9352-81d5" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="fedb-3cbb-b7b5-84ce" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
-        <categoryLink id="7950-4fe6-a1f5-b88d" name="Spartan Class" hidden="false" targetId="47ad-68ce-369f-ed71" primary="false"/>
+        <categoryLink id="7950-4fe6-a1f5-b88d" name="Spartan-Class" hidden="false" targetId="47ad-68ce-369f-ed71" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="e339-7977-e4a2-e01b" name="Escort" hidden="false" collective="false" import="true">
@@ -2786,20 +2721,29 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <modifiers>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="a145-3ec2-9087-5335" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="ea13-fec7-9c46-1904" name="Lesath Exemplar-Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="ea13-fec7-9c46-1904" name="Lesath Exemplar Cruiser Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="e7b4-36aa-bd2e-35e0" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2808,17 +2752,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <categoryLinks>
         <categoryLink id="4974-c63d-3163-29da" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="635c-f2e3-4bdc-533b" name="Order" hidden="false" targetId="0982-cae3-3850-722a" primary="false"/>
-        <categoryLink id="ee81-2dd2-98b8-1c6e" name="Lesath Class" hidden="false" targetId="a040-9146-93db-1474" primary="false"/>
+        <categoryLink id="ee81-2dd2-98b8-1c6e" name="Lesath-Class" hidden="false" targetId="a040-9146-93db-1474" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="750c-1c1e-23fc-169e" name="Attached Unit [Order]" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="750c-1c1e-23fc-169e" name="Attached Unit [Order]" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="12da-08c1-e038-09bc" type="max"/>
           </constraints>
           <selectionEntries>
             <selectionEntry id="48ce-743e-72fb-8b10" name="Carolus Destroyer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
               <categoryLinks>
-                <categoryLink id="d551-6133-b52e-2c13" name="Carolus Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false"/>
+                <categoryLink id="d551-6133-b52e-2c13" name="Carolus-Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false"/>
                 <categoryLink id="9b27-7e71-f74f-7a7b" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
                 <categoryLink id="19d3-772c-ef1a-88a7" name="Order" hidden="false" targetId="0982-cae3-3850-722a" primary="false"/>
               </categoryLinks>
@@ -2838,37 +2782,24 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="9aac-f329-8e79-8de9" name="Lesath" hidden="false" collective="false" import="true" targetId="30a9-7f3e-785b-4904" type="selectionEntry"/>
+        <entryLink id="9aac-f329-8e79-8de9" name="Lesath" hidden="false" collective="false" import="true" targetId="30a9-7f3e-785b-4904" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="a504-ac93-eaaa-d101" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="4ce1-edc3-3106-210c" name="Pharos Hover Dreadnought" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="4ce1-edc3-3106-210c" name="Pharos Hover Dreadnought" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2876,11 +2807,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </modifiers>
       <categoryLinks>
         <categoryLink id="4b75-c23c-442e-dfc5" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="ba04-4d3b-e309-2f22" name="Pharos-class" hidden="false" targetId="5d14-65b6-de93-b097" primary="false"/>
+        <categoryLink id="ba04-4d3b-e309-2f22" name="Pharos-Class" hidden="false" targetId="5d14-65b6-de93-b097" primary="false"/>
         <categoryLink id="f7a3-91e5-b36a-7afe" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="23ed-32c5-a3c2-0d3a" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="23ed-32c5-a3c2-0d3a" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="584a-d013-68f6-d338" type="max"/>
           </constraints>
@@ -2890,90 +2821,61 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="f77c-9c03-8925-217c" name="Pharos" hidden="false" collective="false" import="true" targetId="bb16-58d7-d103-7b06" type="selectionEntry"/>
+        <entryLink id="f77c-9c03-8925-217c" name="Pharos" hidden="false" collective="false" import="true" targetId="bb16-58d7-d103-7b06" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="a296-5689-b7d7-9a9e" name="Lyceum Aerial Dreadnought" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="a296-5689-b7d7-9a9e" name="Lyceum Aerial Dreadnought" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
         </modifier>
-        <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
           <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
           </conditions>
         </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
-          <conditions>
-            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <categoryLinks>
         <categoryLink id="e15f-2ec3-7da1-3a64" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="62f1-75bf-19e5-93d6" name="Lyceum-class" hidden="false" targetId="4dfb-46bb-0bce-b1f6" primary="false"/>
+        <categoryLink id="62f1-75bf-19e5-93d6" name="Lyceum-Class" hidden="false" targetId="4dfb-46bb-0bce-b1f6" primary="false"/>
         <categoryLink id="5333-038c-3d8e-0795" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="e35e-6a3d-85c0-c336" name="Lyceum" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" targetId="c2f8-9b38-35a1-a006" type="selectionEntry"/>
-        <entryLink id="6e30-36b9-bf40-be9c" name="Attached Unit [Turkish Aerial]" hidden="false" collective="false" import="true" targetId="2e7e-0328-269a-76cc" type="selectionEntryGroup"/>
+        <entryLink id="e35e-6a3d-85c0-c336" name="Lyceum" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" targetId="c2f8-9b38-35a1-a006" type="selectionEntry" sortIndex="2"/>
+        <entryLink id="6e30-36b9-bf40-be9c" name="Attached Unit [Turkish Aerial]" hidden="false" collective="false" import="true" targetId="2e7e-0328-269a-76cc" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="2dae-1f2a-35cd-6eb3" name="Tanis Control Ship" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="2dae-1f2a-35cd-6eb3" name="Tanis Control Ship" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-        <modifier type="add" field="category" value="e64d-72dc-2bd8-9391">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2982,10 +2884,10 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <categoryLinks>
         <categoryLink id="2d54-1523-7fa2-da79" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="4f03-ac6d-e01b-5ff7" name="Egyptian" hidden="false" targetId="fba8-77b7-3aa5-a132" primary="false"/>
-        <categoryLink id="419b-4930-558c-f24c" name="Tanis-class" hidden="false" targetId="1dfc-4003-6415-12fc" primary="false"/>
+        <categoryLink id="419b-4930-558c-f24c" name="Tanis-Class" hidden="false" targetId="1dfc-4003-6415-12fc" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="b23a-e5fc-20f1-c9c6" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="b23a-e5fc-20f1-c9c6" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a7da-bb1f-9375-e940" type="max"/>
           </constraints>
@@ -2995,26 +2897,25 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="92c5-7c92-71a1-1c1b" name="Tanis" hidden="false" collective="false" import="true" targetId="d7b6-418e-2cf5-7cf2" type="selectionEntry"/>
+        <entryLink id="92c5-7c92-71a1-1c1b" name="Tanis" hidden="false" collective="false" import="true" targetId="d7b6-418e-2cf5-7cf2" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="fe65-276c-674e-e789" name="Badroulbadour" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="fe65-276c-674e-e789" name="Badroulbadour" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4c83-75fd-df38-a6fd" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3023,7 +2924,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <categoryLinks>
         <categoryLink id="ecb1-e6a0-38bf-5ddb" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="f8b5-177b-f7de-9ee7" name="Crimson League" hidden="false" targetId="8f91-9e5a-36f5-036a" primary="false"/>
-        <categoryLink id="1d55-a8ee-16c4-33d8" name="Lyceum-class" hidden="false" targetId="4dfb-46bb-0bce-b1f6" primary="false"/>
+        <categoryLink id="1d55-a8ee-16c4-33d8" name="Lyceum-Class" hidden="false" targetId="4dfb-46bb-0bce-b1f6" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="2a66-fc06-337a-e1e7" name="Badroulbadour" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" targetId="7331-fbaa-cec9-cb85" type="selectionEntry"/>
@@ -3033,26 +2934,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="672b-02db-0398-5d38" name="Diogenes" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="672b-02db-0398-5d38" name="Diogenes" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
-          <conditions>
-            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <categoryLinks>
         <categoryLink id="b750-da39-0b90-73e9" name="Automata" hidden="false" targetId="f143-0c0d-137b-1745" primary="false"/>
@@ -3067,18 +2959,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="0822-dd80-fa1b-850f" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="278b-bf2f-3b77-682d" name="Praxilla Hunter Killer Submarine Squadron" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="278b-bf2f-3b77-682d" name="Praxilla Hunter Killer Submarine Squadron" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3097,22 +2988,26 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="d597-4742-38ee-22a8" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="f6af-7cb8-49d4-15e9" name="Ketos Myriapoda Colossus Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="f6af-7cb8-49d4-15e9" name="Ketos Myriapoda Colossus Squadron" publicationId="908d-6feb-2e9e-843b" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="set" value="2" field="9005-1399-d8cd-24ff">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="force" childId="797c-79c2-9b15-1d46" shared="true" includeChildSelections="true" includeChildForces="true"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
         <categoryLink id="144b-5101-4f53-ab99" name="Automata" hidden="false" targetId="f143-0c0d-137b-1745" primary="false"/>
@@ -3127,18 +3022,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="4"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="9005-1399-d8cd-24ff" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="54d8-9d67-a2a3-c501" name="Lotan Myriapoda Colossus Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="54d8-9d67-a2a3-c501" name="Lotan Myriapoda Colossus Squadron" publicationId="908d-6feb-2e9e-843b" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3158,18 +3052,8 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="e4ad-3b49-79c2-f541" name="Muharib Skyrunner Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="e4ad-3b49-79c2-f541" name="Muharib Skyrunner Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
         <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
           <conditions>
             <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
@@ -3180,33 +3064,45 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
           </conditions>
         </modifier>
+        <modifier type="set" value="false" field="hidden">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="206a-e800-c094-f4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
       <categoryLinks>
         <categoryLink id="34ff-1bf2-d34d-2fb6" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
         <categoryLink id="507f-48ad-81a6-8bf5" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
-        <categoryLink id="fdd3-b090-f694-3262" name="Muharib-class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false"/>
+        <categoryLink id="fdd3-b090-f694-3262" name="Muharib-Class" hidden="false" targetId="1242-863b-cce3-69cd" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="8250-03ec-6d92-0a6e" name="Muharib" hidden="false" collective="false" import="true" targetId="0125-70a3-f447-d382" type="selectionEntry"/>
-        <entryLink id="a721-ec02-314a-3667" name="Attached Unit [Turkish Aerial]" hidden="false" collective="false" import="true" targetId="2e7e-0328-269a-76cc" type="selectionEntryGroup"/>
+        <entryLink id="8250-03ec-6d92-0a6e" name="Muharib" hidden="false" collective="false" import="true" targetId="0125-70a3-f447-d382" type="selectionEntry" sortIndex="2"/>
+        <entryLink id="a721-ec02-314a-3667" name="Attached Unit [Turkish Aerial]" hidden="false" collective="false" import="true" targetId="2e7e-0328-269a-76cc" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="964c-f537-c58a-3c85" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="b73e-95d9-73f1-be3c" name="Qualor Vitruvian Colossus Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="b73e-95d9-73f1-be3c" name="Qualor Vitruvian Colossus Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="e7b4-36aa-bd2e-35e0" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3215,7 +3111,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <categoryLinks>
         <categoryLink id="aa3a-64a6-aa7a-eded" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
         <categoryLink id="023a-31ce-606f-ff33" name="Order" hidden="false" targetId="0982-cae3-3850-722a" primary="false"/>
-        <categoryLink id="bd32-498b-0eed-a5be" name="Qualor-class" hidden="false" targetId="0824-773a-ce93-7eb9" primary="false"/>
+        <categoryLink id="bd32-498b-0eed-a5be" name="Qualor-Class" hidden="false" targetId="0824-773a-ce93-7eb9" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="4b73-1de6-57ea-fbb9" name="Qualor" hidden="false" collective="false" import="true" targetId="8baf-26f0-1b73-8700" type="selectionEntry"/>
@@ -3224,34 +3120,31 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="812c-2777-e72b-1c29" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
     </selectionEntry>
-    <selectionEntry id="a71a-f148-1905-0822" name="Khoms Heavy Platform" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="a71a-f148-1905-0822" name="Khoms Heavy Platform" publicationId="d854-a2d6-3d52-44c4" hidden="true" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="206a-e800-c094-f4ef" type="instanceOf"/>
-                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="4c83-75fd-df38-a6fd" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="3937-b842-a258-0a51" name="Khoms Class" hidden="false" targetId="c257-ce33-7deb-b335" primary="false"/>
+        <categoryLink id="3937-b842-a258-0a51" name="Khoms-Class" hidden="false" targetId="c257-ce33-7deb-b335" primary="false"/>
         <categoryLink id="46c3-b05d-ef02-e088" name="Tripolitanian" hidden="false" targetId="6a30-e049-f4d0-67f5" primary="false"/>
         <categoryLink id="aecf-b734-3b63-54c4" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="11e7-ca73-835e-9d53" name="Escort" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="11e7-ca73-835e-9d53" name="Escort" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
-            <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="abb7-8e31-c2a9-f18a" type="max"/>
+            <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="abb7-8e31-c2a9-f18a" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="8c01-2acd-d038-ae50" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -3259,40 +3152,31 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="b26c-8a22-52a1-3e1f" name="Khoms" hidden="false" collective="false" import="true" targetId="96e6-17bb-ae04-3710" type="selectionEntry"/>
-        <entryLink id="e9bd-5786-1d66-648b" name="Attached Unit [Tripolitanian]" hidden="false" collective="false" import="true" targetId="675c-7ca1-bd20-962d" type="selectionEntryGroup"/>
+        <entryLink id="b26c-8a22-52a1-3e1f" name="Khoms" hidden="false" collective="false" import="true" targetId="96e6-17bb-ae04-3710" type="selectionEntry" sortIndex="3"/>
+        <entryLink id="e9bd-5786-1d66-648b" name="Attached Unit [Tripolitanian]" hidden="false" collective="false" import="true" targetId="675c-7ca1-bd20-962d" type="selectionEntryGroup" sortIndex="1"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry type="unit" import="true" name="Aronnax Vermiforma Colossus Squadron" hidden="false" id="d411-2922-55d3-a83e" collective="false">
+    <selectionEntry type="unit" import="true" name="Aronnax Vermiforma Colossus Squadron" hidden="true" id="d411-2922-55d3-a83e" collective="false">
       <modifiers>
-        <modifier type="set" value="true" field="hidden">
+        <modifier type="set" value="false" field="hidden">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition type="instanceOf" value="0" field="selections" scope="force" childId="7b7d-3a94-5f90-9f85" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-                <condition type="instanceOf" value="0" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-                <condition type="instanceOf" value="0" field="selections" scope="force" childId="5e20-ec14-f2fa-50e1" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-                <condition type="instanceOf" value="0" field="selections" scope="force" childId="f921-74af-de51-5d2a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-                <condition type="instanceOf" value="0" field="selections" scope="force" childId="e7b4-36aa-bd2e-35e0" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="set-primary" value="8f91-9e5a-36f5-036a" field="category">
-          <conditions>
-            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <categoryLinks>
         <categoryLink name="Automata" hidden="false" id="3908-1386-6d0a-1482" targetId="f143-0c0d-137b-1745" primary="false"/>
         <categoryLink name="Submerged Unit" hidden="false" id="d6b9-8af8-ed69-5860" targetId="df3f-7b38-7940-f11e" primary="true"/>
         <categoryLink name="Crimson League" hidden="false" id="da4e-4b60-b638-f2e0" targetId="8f91-9e5a-36f5-036a" primary="false"/>
-        <categoryLink name="Aronnax-class" hidden="false" id="09df-37a1-4928-1d5d" targetId="e7b7-c408-f86d-191f" primary="false"/>
+        <categoryLink name="Aronnax-Class" hidden="false" id="09df-37a1-4928-1d5d" targetId="e7b7-c408-f86d-191f" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink import="true" name="Aronnax" hidden="false" id="722f-8118-18fe-06e5" collective="false" targetId="eff9-533c-3ac4-ed27" type="selectionEntry">
@@ -3305,13 +3189,20 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="false" id="f319-058d-d3d4-bb9f" includeChildSelections="true"/>
+      </constraints>
     </selectionEntry>
     <selectionEntry type="upgrade" import="true" name="Sultanate Patron" hidden="false" id="267c-0b4c-0da2-0d48" publicationId="d854-a2d6-3d52-44c4">
       <entryLinks>
-        <entryLink import="true" name="Sultanate Patron" hidden="false" id="1790-d4fb-ec39-0a71" type="selectionEntryGroup" targetId="29c7-9654-ea0c-d687"/>
+        <entryLink import="true" name="Sultanate Patron" hidden="false" id="1790-d4fb-ec39-0a71" type="selectionEntryGroup" targetId="29c7-9654-ea0c-d687">
+          <categoryLinks>
+            <categoryLink name="Fleet Abilities" hidden="false" id="72cc-0aa0-a287-bb7c" targetId="dfe9-b90a-3878-78f5" primary="true"/>
+          </categoryLinks>
+        </entryLink>
       </entryLinks>
       <categoryLinks>
-        <categoryLink name="Fleet Abilities" hidden="false" id="1d5c-5fac-2261-e743" targetId="dfe9-b90a-3878-78f5" primary="true"/>
+        <categoryLink name="Fleet Abilities" hidden="false" id="9cf5-7fb7-691d-b51c" targetId="dfe9-b90a-3878-78f5" primary="true"/>
       </categoryLinks>
     </selectionEntry>
   </selectionEntries>
@@ -3327,7 +3218,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="395c-6a32-a6dd-8b9e" name="Elite Crew [3.07a]" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
         <infoLink id="6614-f2c4-9c15-fed5" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="caa0-9bbf-bec1-a185" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="ac45-39d6-99f2-404d" name="The Sultan’s Monitor [3.05]" hidden="false" targetId="7459-7c35-54e7-3655" type="rule"/>
+        <infoLink id="ac45-39d6-99f2-404d" name="The Sultan’s Monitor [3.07]" hidden="false" targetId="7459-7c35-54e7-3655" type="rule"/>
         <infoLink id="64a0-0937-429c-23e0" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="0f95-0b03-895e-5d8f" name="Two per Force [3.07]" hidden="false" targetId="ebed-2a52-5ef9-5148" type="rule"/>
         <infoLink id="faee-7293-a184-5dca" name="Ikili Hull [3.06]" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
@@ -3340,19 +3231,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="228d-db50-5f50-849e" name="Grand Monitor" hidden="false" targetId="69f9-0671-1f6b-53da" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="4aac-1a4f-0ce1-5934" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="4aac-1a4f-0ce1-5934" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="6">
           <constraints>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="034d-849a-30f9-40a9" type="min"/>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9141-cd1e-0a18-b109" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="da13-a6b0-840c-d1d4" name="Port Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="bd8b-d5d7-fe28-658f">
+            <selectionEntryGroup id="da13-a6b0-840c-d1d4" name="Port Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="bd8b-d5d7-fe28-658f" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2c59-9d56-6da1-9c62" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bd02-4d73-98a2-00ab" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="bd8b-d5d7-fe28-658f" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="bd8b-d5d7-fe28-658f" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3360,7 +3251,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="20e3-65c0-9de7-befc" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="8f65-b469-2d5b-447a" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="8f65-b469-2d5b-447a" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3368,7 +3259,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="32d1-3941-636a-ef1f" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="958c-c7c2-cb83-2aca" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="958c-c7c2-cb83-2aca" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3379,7 +3270,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="af76-b1cc-6e6e-4af0" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="af76-b1cc-6e6e-4af0" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3391,14 +3282,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port Second" hidden="false" id="5491-6a74-21c8-15b0" targetId="e1e9-a88-1bb-b8aa" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="3e69-dbfc-acd5-0219" name="Port First" hidden="false" collective="false" import="true" defaultSelectionEntryId="a1f4-1d8f-f9b8-fa74">
+            <selectionEntryGroup id="3e69-dbfc-acd5-0219" name="Port First" hidden="false" collective="false" import="true" defaultSelectionEntryId="a1f4-1d8f-f9b8-fa74" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="15a8-90b1-a7fc-5081" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c3f5-99a2-b97c-ec7c" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="a1f4-1d8f-f9b8-fa74" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="a1f4-1d8f-f9b8-fa74" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3406,7 +3300,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="08eb-be5d-b640-ae16" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="f863-febb-d701-9d80" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="f863-febb-d701-9d80" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3414,7 +3308,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="894f-a492-f7d7-87dc" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="c17b-11f6-9ec6-8ead" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="c17b-11f6-9ec6-8ead" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3425,7 +3319,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="43a4-9f2c-5f1e-b993" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="43a4-9f2c-5f1e-b993" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3437,8 +3331,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port First" hidden="false" id="1d64-6379-5584-3892" targetId="55de-fe5d-650a-2f4a" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="1372-1298-b423-5f7b" name="Starbord First" hidden="false" collective="false" import="true" defaultSelectionEntryId="9572-51aa-ef5c-ff20">
+            <selectionEntryGroup id="1372-1298-b423-5f7b" name="Starbord First" hidden="false" collective="false" import="true" defaultSelectionEntryId="9572-51aa-ef5c-ff20" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a20d-8f3e-90c9-ea82" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="993a-238f-6de1-d96e" type="max"/>
@@ -3471,7 +3368,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="da15-9f6e-af16-706a" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="da15-9f6e-af16-706a" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3483,8 +3380,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Starboard First" hidden="false" id="3842-9400-e9b6-a2a1" targetId="801-696b-9bb1-e4ef" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="6851-0ffe-174e-be68" name="Starbord Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="af47-5edd-57d9-82e9">
+            <selectionEntryGroup id="6851-0ffe-174e-be68" name="Starbord Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="af47-5edd-57d9-82e9" sortIndex="4">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5185-3fe2-90f8-2db7" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4438-ce10-8cd3-e062" type="max"/>
@@ -3517,7 +3417,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="ea8c-a071-5058-4dff" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="ea8c-a071-5058-4dff" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3529,10 +3429,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Starboard Second" hidden="false" id="2cff-b5ae-166b-e861" targetId="a036-e1b6-ee86-ebf7" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="2190-ff99-7596-a3f7" name="Generator" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="2190-ff99-7596-a3f7" name="Generator" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="60df-7e57-62b0-c381" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7782-5c17-26b1-a134" type="max"/>
@@ -3546,28 +3449,36 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <entryLink id="116a-a230-a2bc-e43c" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry"/>
             <entryLink id="2767-d908-cbf5-f88e" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry"/>
             <entryLink id="0cd4-bf2e-2e8a-892f" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry"/>
-            <entryLink id="08d3-670f-277e-4822" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry"/>
             <entryLink id="cdb7-879a-b501-58eb" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry"/>
+            <entryLink import="true" name="Portal generator" hidden="false" id="ebe3-d505-0299-206a" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+              <modifiers>
+                <modifier type="set" value="Portal generator (1)" field="name"/>
+                <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+              </modifiers>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
+              </costs>
+            </entryLink>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="6022-c5a2-f829-a989" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="6022-c5a2-f829-a989" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="3996-dddb-f668-795d" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="3996-dddb-f668-795d" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="714d-1a06-bc89-8b75" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="714d-1a06-bc89-8b75" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="bcd0-0636-dc40-14ba" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
+        <entryLink id="bcd0-0636-dc40-14ba" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="230"/>
@@ -3593,19 +3504,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="c8a0-4dc7-c529-d93e" name="Grand Cruiser" hidden="false" targetId="7d73-4bd1-b044-2f97" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="b940-447f-b9a7-e294" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="b940-447f-b9a7-e294" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="6">
           <constraints>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e52f-26e0-70a8-2196" type="min"/>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="505b-d4ea-4532-04e8" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="fe71-b25d-dfa3-70d3" name="Port Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="9332-1eff-7d2f-c563">
+            <selectionEntryGroup id="fe71-b25d-dfa3-70d3" name="Port Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="9332-1eff-7d2f-c563" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f66e-3833-e5c0-a65d" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1c81-4300-c22e-a2bc" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="9332-1eff-7d2f-c563" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="9332-1eff-7d2f-c563" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3613,7 +3524,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ec4-8bc3-3935-d039" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="fea9-fd96-ca0d-817b" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="fea9-fd96-ca0d-817b" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3621,7 +3532,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8256-d11b-52b6-90a2" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="26cf-4db7-b785-35aa" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="26cf-4db7-b785-35aa" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3632,7 +3543,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="f5d9-be51-7327-b1d1" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="f5d9-be51-7327-b1d1" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3644,14 +3555,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port Second" hidden="false" id="9546-49f1-40eb-d975" targetId="e1e9-a88-1bb-b8aa" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="c644-3273-f1a1-e3b5" name="Port First" hidden="false" collective="false" import="true" defaultSelectionEntryId="4f80-f02e-9aee-69de">
+            <selectionEntryGroup id="c644-3273-f1a1-e3b5" name="Port First" hidden="false" collective="false" import="true" defaultSelectionEntryId="4f80-f02e-9aee-69de" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6963-1034-927d-762a" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a4ad-1d9d-ac69-622e" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="4f80-f02e-9aee-69de" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="4f80-f02e-9aee-69de" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3659,7 +3573,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="67ce-2434-a7b6-f8c6" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="97da-94b6-f768-24a9" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="97da-94b6-f768-24a9" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3667,7 +3581,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eabc-8484-b125-5b79" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="d83f-8a37-5fe5-b193" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="d83f-8a37-5fe5-b193" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3678,7 +3592,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="71a0-cd48-ee70-99e1" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="71a0-cd48-ee70-99e1" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -3690,14 +3604,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port First" hidden="false" id="8a4e-b76a-a6f4-c111" targetId="55de-fe5d-650a-2f4a" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="47a3-9ad9-66b1-4221" name="Starbord First" hidden="false" collective="false" import="true" defaultSelectionEntryId="7e57-8271-6d8c-a9ac">
+            <selectionEntryGroup id="47a3-9ad9-66b1-4221" name="Starbord First" hidden="false" collective="false" import="true" defaultSelectionEntryId="7e57-8271-6d8c-a9ac" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="adb3-19ab-32f2-4b00" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7189-d8f0-b6f7-019c" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7e57-8271-6d8c-a9ac" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="7e57-8271-6d8c-a9ac" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3705,7 +3622,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e9ac-97f3-c566-ab78" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="de72-ae2e-779f-133f" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="de72-ae2e-779f-133f" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3713,7 +3630,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f457-5828-885d-db51" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="0938-2f48-dac0-69ca" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="0938-2f48-dac0-69ca" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3724,7 +3641,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="c1d2-e9a4-839d-1340" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="c1d2-e9a4-839d-1340" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3736,14 +3653,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Starboard First" hidden="false" id="784e-64bb-e6de-30ac" targetId="801-696b-9bb1-e4ef" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="3769-464b-78ef-9d87" name="Starbord Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="5733-1b64-fc4f-821b">
+            <selectionEntryGroup id="3769-464b-78ef-9d87" name="Starbord Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="5733-1b64-fc4f-821b" sortIndex="4">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5df1-baac-2d54-119d" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="02ee-4944-6396-3d42" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="5733-1b64-fc4f-821b" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="5733-1b64-fc4f-821b" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3751,7 +3671,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0796-7465-18d6-f5ae" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="a8d5-5615-3341-b936" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="a8d5-5615-3341-b936" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3759,7 +3679,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5362-7455-5c19-094a" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="0dea-61f6-e7a3-a38f" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="0dea-61f6-e7a3-a38f" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3770,7 +3690,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d092-15f1-225e-d55e" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="d092-15f1-225e-d55e" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -3782,10 +3702,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Starboard Second" hidden="false" id="c1cd-ffd8-4127-6b0d" targetId="a036-e1b6-ee86-ebf7" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="606e-a551-c0fa-e545" name="Secondary Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="606e-a551-c0fa-e545" name="Secondary Weapon" hidden="false" collective="false" import="true" sortIndex="7">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4b02-cab9-1e3a-418e" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="81f5-1a20-0016-1573" type="max"/>
@@ -3797,7 +3720,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7b33-e28b-79e6-df59" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7a2a-0989-1a21-05d1" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="7a2a-0989-1a21-05d1" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -3823,7 +3746,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a028-d2b6-8a0b-9ce1" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="df16-a05c-4285-e6ea" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="df16-a05c-4285-e6ea" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -3845,7 +3768,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="d493-d1c1-b024-3f79" name="Generator" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="d493-d1c1-b024-3f79" name="Generator" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="760d-074c-be3a-4d2e" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9831-e193-9bda-2639" type="max"/>
@@ -3884,31 +3807,41 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="53c8-004c-6f6b-99da" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="b30d-d6d2-8b37-97a0" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="92e4-e2df-6b19-d657" type="max"/>
-              </constraints>
+            <entryLink import="true" name="Portal generator" hidden="false" id="a8ba-e720-6b86-7bd7" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+              <modifiers>
+                <modifier type="set" value="Portal generator (1)" field="name"/>
+                <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+              </modifiers>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
+              </costs>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="b290-7fb4-0f70-72c6" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="b290-7fb4-0f70-72c6" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="208d-2298-d668-9cc1" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="208d-2298-d668-9cc1" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Starboard First" hidden="false" id="7198-fc33-1c89-011f" targetId="801-696b-9bb1-e4ef" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="6b1e-a35b-e621-b260" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="6b1e-a35b-e621-b260" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Port First" hidden="false" id="9fd3-77a8-3d5f-a5e2" targetId="55de-fe5d-650a-2f4a" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="b979-5029-af6d-cc07" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
+        <entryLink id="b979-5029-af6d-cc07" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="280"/>
@@ -3932,22 +3865,21 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </infoLink>
         <infoLink id="1716-c06b-4fdb-daab" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="4fe5-3943-e5e4-df6b" name="Cor Caroli [3.06]" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
-        <infoLink id="ceae-1330-688b-0668" name="Elite Crew [3.07a]" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
         <infoLink id="a325-2da1-11d1-4d50" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="a7a6-488c-e1d9-3e4f" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="943a-db80-10db-4f92" name="Orichalcite Crafted [3.06]" hidden="false" targetId="3348-f492-40ac-7e07" type="rule"/>
+        <infoLink id="943a-db80-10db-4f92" name="Orichalcite Crafted [3.07]" hidden="false" targetId="3348-f492-40ac-7e07" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="0a57-39c5-364c-6dca" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="da2a-e53c-40d1-7b8e" name="Destroyer" hidden="false" targetId="63a3-004a-8e9f-2eb4" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="e1ee-c492-4313-b4ad" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="e1ee-c492-4313-b4ad" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="fae2-26c7-645d-7783" name="Judgement Lance" hidden="false" collective="false" import="true" targetId="d86c-d2c7-7964-5f8b" type="selectionEntry">
+        <entryLink id="fae2-26c7-645d-7783" name="Judgement Lance" hidden="false" collective="false" import="true" targetId="d86c-d2c7-7964-5f8b" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -3975,19 +3907,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink name="Fast Destroyer" hidden="false" id="c3da-190f-43f-3c2b" targetId="5ff2-dbb6-8bd2-a160" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="0ee7-7720-005f-5f88" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="0ee7-7720-005f-5f88" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a4a2-2049-0610-7bed" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2a0a-d19d-2183-469b" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="ddf6-af1b-7e30-7ff3" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="4f67-b1a3-66b3-6b13">
+            <selectionEntryGroup id="ddf6-af1b-7e30-7ff3" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="4f67-b1a3-66b3-6b13" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c1ed-0307-cf9d-340f" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7fa0-0309-44ce-04e4" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="175e-6e76-ef86-1ec6" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="175e-6e76-ef86-1ec6" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -3998,7 +3930,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="4f67-b1a3-66b3-6b13" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="4f67-b1a3-66b3-6b13" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4006,7 +3938,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d0a7-9e94-1982-a21b" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="28e8-a0ac-c83d-cd73" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="28e8-a0ac-c83d-cd73" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4016,13 +3948,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="3508-8c12-504c-4de8" name="Rear" hidden="false" collective="false" import="true" defaultSelectionEntryId="24fa-b1de-a41d-be00">
+            <selectionEntryGroup id="3508-8c12-504c-4de8" name="Rear" hidden="false" collective="false" import="true" defaultSelectionEntryId="24fa-b1de-a41d-be00" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="53fb-9769-6d19-41d0" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c511-73e3-d4bc-a1c0" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="1200-427c-a05a-6680" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="1200-427c-a05a-6680" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -4055,12 +3987,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="9451-9054-8a87-b93a" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry">
+        <entryLink id="9451-9054-8a87-b93a" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="72ca-fcfe-b867-3c14" name="Micro Torpedo Salvo" hidden="false" collective="false" import="true" targetId="ca1a-2241-066b-449a" type="selectionEntry">
+        <entryLink id="72ca-fcfe-b867-3c14" name="Micro Torpedo Salvo" hidden="false" collective="false" import="true" targetId="ca1a-2241-066b-449a" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -4090,13 +4022,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="7b4c-2ba4-631d-1b47" name="Cruiser" hidden="false" targetId="c59d-c602-bfb0-1b11" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="6c19-40a8-9287-ae7a" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="6c19-40a8-9287-ae7a" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8ebc-954e-79b8-3bb4" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b91e-0f30-f137-aa8f" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="a171-7615-28f6-a46f" name="Generator" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="a171-7615-28f6-a46f" name="Generator" hidden="false" collective="false" import="true" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6768-94dc-8923-997e" type="max"/>
               </constraints>
@@ -4160,17 +4092,21 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="e33d-263b-ac85-7d0b" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="38c4-f2f3-adb4-c163" type="max"/>
-                  </constraints>
+                <entryLink import="true" name="Portal generator" hidden="false" id="577f-9c39-11d5-16d2" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" value="Portal generator (1)" field="name"/>
+                    <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+                  </modifiers>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="61cb-ace7-3586-3ed9" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="86b9-04a7-93d9-34d8" name="Front First" hidden="false" collective="false" import="true" defaultSelectionEntryId="8b79-5225-6dd0-4671">
+            <selectionEntryGroup id="86b9-04a7-93d9-34d8" name="Front First" hidden="false" collective="false" import="true" defaultSelectionEntryId="8b79-5225-6dd0-4671" sortIndex="1">
               <modifiers>
                 <modifier type="set" field="fe57-7a5e-615e-1d8f" value="0">
                   <conditions>
@@ -4210,7 +4146,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="a808-8036-f0df-af1b" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="a808-8036-f0df-af1b" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4223,7 +4159,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="c941-bf9c-7c45-583d" name="Front Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="93e2-98f7-60d7-fb06">
+            <selectionEntryGroup id="c941-bf9c-7c45-583d" name="Front Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="93e2-98f7-60d7-fb06" sortIndex="2">
               <modifiers>
                 <modifier type="set" field="f89f-8778-0120-d5f3" value="0">
                   <conditions>
@@ -4263,7 +4199,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="8f5d-8abd-5eff-61a5" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="8f5d-8abd-5eff-61a5" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4280,12 +4216,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="57fc-8222-cd34-a52b" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="57fc-8222-cd34-a52b" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="2539-00e5-1e7e-5347" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="2539-00e5-1e7e-5347" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -4314,13 +4250,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="a818-8b01-7a3c-c145" name="Frigate" hidden="false" targetId="34e1-40d5-5011-e3c5" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="35c4-38be-c957-3426" name="Main Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="f105-ad6b-fe8d-f6e0">
+        <selectionEntryGroup id="35c4-38be-c957-3426" name="Main Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="f105-ad6b-fe8d-f6e0" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4f01-a2c0-b587-c26e" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9804-3334-247b-b0ed" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="e71f-baea-45ad-1df8" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+            <entryLink id="e71f-baea-45ad-1df8" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
               </modifiers>
@@ -4331,7 +4267,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="6"/>
               </costs>
             </entryLink>
-            <entryLink id="f105-ad6b-fe8d-f6e0" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+            <entryLink id="f105-ad6b-fe8d-f6e0" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
               </modifiers>
@@ -4339,7 +4275,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e44a-d44f-8245-27d5" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="abbd-7358-4ac8-ac50" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+            <entryLink id="abbd-7358-4ac8-ac50" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
               </modifiers>
@@ -4351,12 +4287,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="4d5f-8c28-7748-fac2" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry">
+        <entryLink id="4d5f-8c28-7748-fac2" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="3018-e6e4-9aa4-f9bb" name="Micro Torpedo Salvo" hidden="false" collective="false" import="true" targetId="ca1a-2241-066b-449a" type="selectionEntry">
+        <entryLink id="3018-e6e4-9aa4-f9bb" name="Micro Torpedo Salvo" hidden="false" collective="false" import="true" targetId="ca1a-2241-066b-449a" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -4393,7 +4329,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="3214-adff-cc04-b99f" name="Fleet Carrier" hidden="false" targetId="408c-1732-73f9-379d" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="0ba0-0c69-f4ba-6eca" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="0ba0-0c69-f4ba-6eca" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="upgrade" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="aca8-5999-ff58-2e67" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cd3e-62c8-9aa2-bb85" type="max"/>
@@ -4412,32 +4348,32 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntry>
       </selectionEntries>
       <entryLinks>
-        <entryLink id="3c0f-548a-53c1-7e24" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="3c0f-548a-53c1-7e24" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="f7d3-b726-904a-cbb9" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="f7d3-b726-904a-cbb9" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1f7b-56c0-2e8a-9aa7" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="1f7b-56c0-2e8a-9aa7" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
         </entryLink>
-        <entryLink id="20a5-85ea-69a8-4d6d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="20a5-85ea-69a8-4d6d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
         </entryLink>
-        <entryLink id="c0c8-39bb-d629-8ca8" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="c0c8-39bb-d629-8ca8" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="7">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
         </entryLink>
-        <entryLink id="0b17-6ac2-a3c4-b15d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
+        <entryLink id="0b17-6ac2-a3c4-b15d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="325"/>
@@ -4464,13 +4400,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="5807-4df9-215a-86db" name="Heavy Battlecruiser" hidden="false" targetId="022c-02a2-ca98-aabe" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="e791-211c-de8a-dc0b" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="e791-211c-de8a-dc0b" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a3a6-88c3-1922-468c" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eb51-6a03-3198-28c2" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="e078-2fb4-a4d8-da67" name="Generator" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="e078-2fb4-a4d8-da67" name="Generator" hidden="false" collective="false" import="true" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dea4-3402-2a27-7870" type="max"/>
               </constraints>
@@ -4534,17 +4470,18 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="0ee3-6807-794d-f388" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8e61-fce7-d1fc-9a25" type="max"/>
-                  </constraints>
+                <entryLink import="true" name="Portal generator" hidden="false" id="00eb-ecd3-85d3-9eb6" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" value="Portal generator (1)" field="name"/>
+                    <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+                  </modifiers>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="68ef-1643-9693-889e" name="Front First" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="fa1f-290a-a649-75f0">
+            <selectionEntryGroup id="68ef-1643-9693-889e" name="Front First" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="fa1f-290a-a649-75f0" sortIndex="1">
               <modifiers>
                 <modifier type="set" field="d490-f07b-ed31-6cf8" value="0">
                   <conditions>
@@ -4584,7 +4521,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f1d1-e358-fcc1-a673" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="741c-8402-b1ad-646e" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="741c-8402-b1ad-646e" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4596,8 +4533,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Front First" hidden="false" id="e8c2-a797-a6b9-2879" targetId="62c7-5eb0-d38e-486" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="3eb7-cba4-3559-f22d" name="Front Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="82cf-2e9a-4b55-ecd0">
+            <selectionEntryGroup id="3eb7-cba4-3559-f22d" name="Front Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="82cf-2e9a-4b55-ecd0" sortIndex="2">
               <modifiers>
                 <modifier type="set" field="ce73-d00e-b0a3-a2cb" value="0">
                   <conditions>
@@ -4637,7 +4577,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eeef-d2b6-5a31-ea9a" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="593e-296e-1c7b-29d8" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="593e-296e-1c7b-29d8" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4649,10 +4589,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Front Second" hidden="false" id="9f70-67f6-02bc-4f9a" targetId="c595-958b-800e-2c04" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="9bfd-06de-af97-e73c" name="Secondary Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="9bfd-06de-af97-e73c" name="Secondary Weapon" hidden="false" collective="false" import="true" sortIndex="4">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9a2b-aea4-86de-d248" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c37b-ef11-cc11-ca9d" type="max"/>
@@ -4680,7 +4623,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a23a-6285-b03f-9327" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="c612-7cf5-73b5-7ae5" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="c612-7cf5-73b5-7ae5" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -4699,7 +4642,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d89b-c6df-844e-9f1f" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="2ed1-ec7f-ee4b-5547" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="2ed1-ec7f-ee4b-5547" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -4732,12 +4675,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="e99d-8207-2ed7-f498" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="e99d-8207-2ed7-f498" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="9e3d-eadd-23f9-def6" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
+        <entryLink id="9e3d-eadd-23f9-def6" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -4757,7 +4700,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="2c37-991f-333b-cdd9" name="Corvette Class" hidden="false" targetId="dfce-ed39-89c4-47a9" primary="false"/>
       </categoryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="8"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="6"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
@@ -4781,17 +4724,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="02e4-eb8f-d1eb-e9b8" name="Supply Ship" hidden="false" targetId="de22-8efd-37f3-0fbc" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="9f91-2117-da54-0fa7" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="9f91-2117-da54-0fa7" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="d25d-169f-980a-f0e2" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="d25d-169f-980a-f0e2" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="71a6-6249-0367-8d01" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="71a6-6249-0367-8d01" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -4823,7 +4766,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="fac0-2093-3342-d536" name="Support Carrier" hidden="false" targetId="dc06-6d22-be64-c6eb" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="b8e3-21d4-a54a-6feb" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="true" import="true" type="upgrade">
+        <selectionEntry id="b8e3-21d4-a54a-6feb" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="true" import="true" type="upgrade" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dc51-3fa3-e9d7-607b" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d2b4-6b0b-b3f2-aa78" type="max"/>
@@ -4842,17 +4785,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntry>
       </selectionEntries>
       <entryLinks>
-        <entryLink id="6016-43c8-b8eb-ab71" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="6016-43c8-b8eb-ab71" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="5850-242b-a258-ef0f" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="5850-242b-a258-ef0f" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="2e4c-3c17-1d01-6662" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="2e4c-3c17-1d01-6662" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -4882,13 +4825,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="07c3-8b6c-5ba4-e013" name="Monitor" hidden="false" targetId="4b6f-2ef4-32c9-a605" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="b1ca-1850-a378-e2f3" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="b1ca-1850-a378-e2f3" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dd69-8c3d-acef-7bb6" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1661-b5d3-27ce-6bfb" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="ef04-a365-d038-d0d7" name="Generator" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="ef04-a365-d038-d0d7" name="Generator" hidden="false" collective="false" import="true" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="87db-29bf-a07c-6356" type="max"/>
               </constraints>
@@ -4896,7 +4839,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <categoryLink id="044f-6b4d-4463-cb70" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
               </categoryLinks>
               <entryLinks>
-                <entryLink id="1315-ab4b-d1a6-db9b" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry">
+                <entryLink id="1315-ab4b-d1a6-db9b" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry" sortIndex="1">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3f42-088c-5b71-b7a9" type="max"/>
                   </constraints>
@@ -4904,7 +4847,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="e6b0-b30f-4bf5-f6c1" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
+                <entryLink id="e6b0-b30f-4bf5-f6c1" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry" sortIndex="2">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="89e3-76f6-23bb-5fb6" type="max"/>
                   </constraints>
@@ -4912,7 +4855,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="ac43-9260-f183-14d6" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
+                <entryLink id="ac43-9260-f183-14d6" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry" sortIndex="3">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d6b2-dbcd-928d-b3ab" type="max"/>
                   </constraints>
@@ -4920,7 +4863,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="adbd-d8aa-c441-8c02" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry">
+                <entryLink id="adbd-d8aa-c441-8c02" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry" sortIndex="4">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ac1a-e9e6-9637-ef6a" type="max"/>
                   </constraints>
@@ -4928,7 +4871,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="f016-e928-e996-fedd" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
+                <entryLink id="f016-e928-e996-fedd" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry" sortIndex="6">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8b12-86aa-1c65-c1fb" type="max"/>
                   </constraints>
@@ -4936,7 +4879,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="ec5a-2eb2-7dd7-eeec" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
+                <entryLink id="ec5a-2eb2-7dd7-eeec" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry" sortIndex="7">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="afbb-e0f5-46ab-7c5c" type="max"/>
                   </constraints>
@@ -4944,7 +4887,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="5323-76fc-6158-4303" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
+                <entryLink id="5323-76fc-6158-4303" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry" sortIndex="8">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d14e-941b-f6d0-9511" type="max"/>
                   </constraints>
@@ -4952,17 +4895,18 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="861a-e6d9-3cb5-bb40" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5aab-c6c1-d81d-465a" type="max"/>
-                  </constraints>
+                <entryLink import="true" name="Portal generator" hidden="false" id="a2c5-fea4-7b65-a9c8" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry" sortIndex="5">
+                  <modifiers>
+                    <modifier type="set" value="Portal generator (1)" field="name"/>
+                    <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+                  </modifiers>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="4a78-784a-77e3-5cde" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="b60d-1ab3-eea5-0c7b">
+            <selectionEntryGroup id="4a78-784a-77e3-5cde" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="b60d-1ab3-eea5-0c7b" sortIndex="1">
               <modifiers>
                 <modifier type="set" field="75b0-82ea-1bf0-3d1b" value="0">
                   <conditions>
@@ -4975,7 +4919,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4a83-20a0-d296-6258" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="b60d-1ab3-eea5-0c7b" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="b60d-1ab3-eea5-0c7b" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4983,7 +4927,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4908-8b37-7649-63c8" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="1c2f-32ad-fe8e-f196" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="1c2f-32ad-fe8e-f196" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4991,7 +4935,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1c72-08f8-971a-7556" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="0c36-25b2-f435-2ba0" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="0c36-25b2-f435-2ba0" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5002,7 +4946,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="c408-6541-b2c3-6b98" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="c408-6541-b2c3-6b98" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5019,12 +4963,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="3fdb-331d-49fa-f313" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="3fdb-331d-49fa-f313" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="25da-d688-639d-539e" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="25da-d688-639d-539e" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -5058,27 +5002,31 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="625b-45de-e127-10c1" name="Bombardment Cruiser" hidden="false" targetId="9566-ae5c-ce6d-637b" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="97a5-480c-950b-6838" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="97a5-480c-950b-6838" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="b81e-68c8-2d16-898c" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="b81e-68c8-2d16-898c" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1de0-a309-ac08-9caf" name="Orichalcite Flechette Launcher" hidden="false" collective="false" import="true" targetId="db84-1c9c-98de-aa16" type="selectionEntry">
+        <entryLink id="1de0-a309-ac08-9caf" name="Orichalcite Flechette Launcher" hidden="false" collective="false" import="true" targetId="db84-1c9c-98de-aa16" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="7241-06a8-bcad-e532" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
-        <entryLink id="3021-b368-7f95-9ee0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="3021-b368-7f95-9ee0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
+        <entryLink import="true" name="Portal generator" hidden="false" id="96a8-a654-66e5-0732" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="1">
+          <modifiers>
+            <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="135"/>
@@ -5104,7 +5052,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="7896-3418-a51d-8789" name="Light Cruiser" hidden="false" targetId="eaa8-98cf-39ba-0a38" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="3095-1462-4132-dcfa" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="3095-1462-4132-dcfa" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="338d-e0f8-e692-fbbe" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e6a7-f792-9c7c-584b" type="max"/>
@@ -5123,7 +5071,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c644-17a0-8015-eba3" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="3739-ac6a-f705-9670" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="3739-ac6a-f705-9670" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5131,7 +5079,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="43ef-b695-fddb-1676" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="1f73-0dfd-0ffd-9f77" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="1f73-0dfd-0ffd-9f77" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5139,7 +5087,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="98f6-8ffa-ae07-29da" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="cd50-81a8-ff3d-3048" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="cd50-81a8-ff3d-3048" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5150,7 +5098,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d93e-de6b-cfcd-e8ec" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="d93e-de6b-cfcd-e8ec" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5191,22 +5139,26 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="4495-39e1-08f4-2c70" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                <entryLink id="bffb-d131-ba50-f02d" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="bffb-d131-ba50-f02d" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
+                <entryLink id="c1fd-2878-60d6-7d4c" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="c1fd-2878-60d6-7d4c" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
+                <entryLink id="282d-d0fe-1030-05d2" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="282d-d0fe-1030-05d2" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
+                <entryLink import="true" name="Portal generator" hidden="false" id="7c3a-c75f-b43d-c632" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" value="Portal generator (1)" field="name"/>
+                    <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+                  </modifiers>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
@@ -5215,13 +5167,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="d65b-f9ba-fc0a-f95d" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="7f79-4dd2-704b-0215">
+        <selectionEntryGroup id="d65b-f9ba-fc0a-f95d" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="7f79-4dd2-704b-0215" sortIndex="4">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b0c5-0a62-d943-65f7" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d1bb-5702-3017-239a" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="098d-fce2-f44d-1fdf" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+            <entryLink id="098d-fce2-f44d-1fdf" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
@@ -5232,7 +5184,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
               </costs>
             </entryLink>
-            <entryLink id="7f79-4dd2-704b-0215" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+            <entryLink id="7f79-4dd2-704b-0215" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
@@ -5240,7 +5192,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="39c7-9aea-ce06-64a4" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="9b90-8226-0a7e-c9a9" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+            <entryLink id="9b90-8226-0a7e-c9a9" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
@@ -5252,12 +5204,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="5a2b-2cf8-d209-66d4" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="5a2b-2cf8-d209-66d4" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="31d3-f232-da7a-b67a" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="31d3-f232-da7a-b67a" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
@@ -5280,7 +5232,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="2920-9892-0d14-6afb" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="1e4f-4d2f-214c-370b" name="Gun Runner [3.06]" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
         <infoLink id="7ccb-27ce-d537-4894" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="674c-ab19-ef2d-fa5f" name="Focused Gunnery [3.06]" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="674c-ab19-ef2d-fa5f" name="Focused Fire (x) [3.07a]" hidden="false" targetId="6c94-ad2b-60d8-2c4f" type="rule">
+          <modifiers>
+            <modifier type="set" value="Focused Fire (Gunnery)" field="name"/>
+          </modifiers>
+        </infoLink>
         <infoLink id="4807-ac59-eb22-dc41" name="Maritime Patrol [3.07a]" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -5288,13 +5244,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="5581-ebdf-ed9d-b3ca" name="Heavy Cruiser" hidden="false" targetId="caff-acb6-3e5e-e359" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="15ea-bd1e-b000-a12d" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="15ea-bd1e-b000-a12d" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a9f8-f151-58e2-a745" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="01ba-baf8-b4b7-e1c4" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="3f0a-3891-db60-299b" name="Generator" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="3f0a-3891-db60-299b" name="Generator" hidden="false" collective="false" import="true" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4eeb-5795-8792-a4cb" type="max"/>
               </constraints>
@@ -5322,29 +5278,33 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="45ac-4354-128d-05eb" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                <entryLink id="0017-476f-564d-b05e" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="0017-476f-564d-b05e" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
+                <entryLink id="f7bd-1474-72ce-1cdf" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="f7bd-1474-72ce-1cdf" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
+                <entryLink id="2150-c35c-677b-ad79" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="2150-c35c-677b-ad79" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
+                <entryLink import="true" name="Portal generator" hidden="false" id="9cd5-3aef-5dc1-e9cd" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" value="Portal generator (1)" field="name"/>
+                    <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+                  </modifiers>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="6ff9-8375-7eb4-53e5" name="Front First" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="0223-913c-04be-b716">
+            <selectionEntryGroup id="6ff9-8375-7eb4-53e5" name="Front First" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="0223-913c-04be-b716" sortIndex="1">
               <modifiers>
                 <modifier type="set" field="d9f3-58eb-06a8-3821" value="0">
                   <conditions>
@@ -5384,7 +5344,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="214b-9f19-50c0-ea4a" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="214b-9f19-50c0-ea4a" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5396,8 +5356,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Front First" hidden="false" id="6e81-6d14-0ae2-dff8" targetId="62c7-5eb0-d38e-486" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="230a-619f-a150-eb91" name="Front Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="ee74-3f40-4775-ea0d">
+            <selectionEntryGroup id="230a-619f-a150-eb91" name="Front Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="ee74-3f40-4775-ea0d" sortIndex="2">
               <modifiers>
                 <modifier type="set" field="8693-e8ee-e871-092f" value="0">
                   <conditions>
@@ -5437,7 +5400,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="0f94-2898-8898-7ca7" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="0f94-2898-8898-7ca7" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5449,16 +5412,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Front Second" hidden="false" id="e164-f35b-61e3-66ec" targetId="c595-958b-800e-2c04" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="d7ea-d195-997a-7344" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="bdeb-efb7-c518-b852">
+        <selectionEntryGroup id="d7ea-d195-997a-7344" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="bdeb-efb7-c518-b852" sortIndex="4">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6754-f75c-aba7-c5c7" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="519a-480a-b2b7-e5b9" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="d3bf-ce70-00d3-cd88" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+            <entryLink id="d3bf-ce70-00d3-cd88" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
@@ -5469,7 +5435,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
               </costs>
             </entryLink>
-            <entryLink id="bdeb-efb7-c518-b852" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+            <entryLink id="bdeb-efb7-c518-b852" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
@@ -5477,7 +5443,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9a57-38b9-7479-394a" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="e117-45aa-0033-5244" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+            <entryLink id="e117-45aa-0033-5244" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
@@ -5489,12 +5455,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="f029-1e81-34f6-c9aa" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="f029-1e81-34f6-c9aa" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="b094-2a0e-e575-991a" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="b094-2a0e-e575-991a" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -5523,46 +5489,44 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="3af7-5c0c-223b-9cfb" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="e888-d9bf-fbc8-4ce2" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
         <infoLink id="02a1-664a-afc5-686f" name="Cor Caroli [3.06]" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
-        <infoLink id="7c5f-5981-487f-1876" name="Elite Crew [3.07a]" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
         <infoLink id="fc68-79e0-05b1-925e" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="832e-7782-02f0-aba5" name="Ikili Hull [3.06]" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
         <infoLink id="24e8-5479-6f19-6f60" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
         <infoLink id="5e25-c710-4aa2-46c7" name="Heavy Firepower [3.07a]" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="720b-49f8-f6ea-a411" name="Fortunes of War [3.07a]" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
-        <infoLink id="fc52-950d-6f44-f2dd" name="Portal Focus [3.06]" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
-        <infoLink id="0e25-ab28-4871-1bc7" name="Portal Mastery [3.06]" hidden="false" targetId="db90-0b63-d0f9-5222" type="rule"/>
+        <infoLink id="0e25-ab28-4871-1bc7" name="Master Portal Generator [3.07]" hidden="false" targetId="db90-0b63-d0f9-5222" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="8ae0-147c-8429-29a6" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="0aed-93f2-4e80-073c" name="Portalship" hidden="false" targetId="4ea2-ac64-84ea-ff57" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="3bd2-61f1-0939-e06e" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="3bd2-61f1-0939-e06e" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1271-ec9f-80d2-8a8f" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
+        <entryLink id="1271-ec9f-80d2-8a8f" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1dcc-dcc4-d69e-8675" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
+        <entryLink id="1dcc-dcc4-d69e-8675" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1e6c-e45e-b685-1d6e" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry">
+        <entryLink id="1e6c-e45e-b685-1d6e" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="4047-9a3b-eb47-ed51" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry">
+        <entryLink id="4047-9a3b-eb47-ed51" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry" sortIndex="7">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="4e11-339c-87be-018f" name="Helio Blast" hidden="false" collective="false" import="true" targetId="18cb-9f26-bdc9-fb3b" type="selectionEntry">
+        <entryLink id="4e11-339c-87be-018f" name="Helio Blast" hidden="false" collective="false" import="true" targetId="18cb-9f26-bdc9-fb3b" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -5571,6 +5535,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bf46-1230-c88d-8f2e" type="max"/>
           </constraints>
         </entryLink>
+        <entryLink import="true" name="Portal generator" hidden="false" id="8f72-2394-e012-ea3e" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="1">
+          <modifiers>
+            <modifier type="set" value="Portal generator (2)" field="name"/>
+            <modifier type="add" value="8901-cc02-f55e-2ee5" field="category"/>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="315"/>
@@ -5587,7 +5557,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="7f38-16fd-bf95-fe74" name="Nemrut" hidden="false" targetId="6723-e94d-41c8-d442" type="profile"/>
         <infoLink id="12de-3451-7aac-eff9" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="89fb-4609-e07a-f338" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="0f76-44e1-c23e-5267" name="The Sultan’s Hammer [3.06]" hidden="false" targetId="0621-51de-26b8-202f" type="rule"/>
+        <infoLink id="0f76-44e1-c23e-5267" name="The Sultan’s Hammer [3.07]" hidden="false" targetId="0621-51de-26b8-202f" type="rule"/>
         <infoLink id="2bb2-1aea-eb5f-019b" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="763f-1588-acc1-f441" name="Ikili Hull [3.06]" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
         <infoLink id="51d3-f2b2-75bb-97c8" name="Two per Force [3.07]" hidden="false" targetId="ebed-2a52-5ef9-5148" type="rule"/>
@@ -5598,53 +5568,57 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="f14e-3169-7eeb-6bdf" name="Superiority Cruiser" hidden="false" targetId="9bba-e173-1b7a-c420" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="8452-0bde-79f1-36c3" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="8452-0bde-79f1-36c3" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="10">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="add1-ba25-7589-9188" name="Orichalcite Flechette Launcher" hidden="false" collective="false" import="true" targetId="db84-1c9c-98de-aa16" type="selectionEntry">
+        <entryLink id="add1-ba25-7589-9188" name="Orichalcite Flechette Launcher" hidden="false" collective="false" import="true" targetId="db84-1c9c-98de-aa16" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="366b-c73b-1c59-de8e" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry">
+        <entryLink id="366b-c73b-1c59-de8e" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
         </entryLink>
-        <entryLink id="ebf7-2e5c-60ed-8d66" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry">
+        <entryLink id="ebf7-2e5c-60ed-8d66" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
         </entryLink>
-        <entryLink id="e34a-d9f3-1e1b-3534" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="e34a-d9f3-1e1b-3534" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="320d-afb0-4f5d-11d6" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="320d-afb0-4f5d-11d6" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="11">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1249-69a1-6bc2-6cfd" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
-        <entryLink id="f4e5-818b-c998-c03d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
-        <entryLink id="afce-1bd2-11db-50fa" name="Orichalcite Flechette Launcher" hidden="false" collective="false" import="true" targetId="db84-1c9c-98de-aa16" type="selectionEntry">
+        <entryLink id="f4e5-818b-c998-c03d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="2"/>
+        <entryLink id="afce-1bd2-11db-50fa" name="Orichalcite Flechette Launcher" hidden="false" collective="false" import="true" targetId="db84-1c9c-98de-aa16" type="selectionEntry" sortIndex="7">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="b8a5-c2f9-c8c9-a4c3" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="b8a5-c2f9-c8c9-a4c3" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="8">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="8028-bce1-829e-42a7" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="8028-bce1-829e-42a7" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="9">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
+        <entryLink import="true" name="Portal generator" hidden="false" id="3b78-f700-b199-8641" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="1">
+          <modifiers>
+            <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="245"/>
@@ -5671,19 +5645,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="56fc-15cd-e30f-0689" name="Ikili Cruiser" hidden="false" targetId="b0dc-450c-d771-bc6f" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="dc59-3bb0-6548-59a2" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="dc59-3bb0-6548-59a2" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="6">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6e56-5efa-06fe-9ea1" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a554-19f4-7762-2a62" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="171a-8ac6-f92f-cfee" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="0953-e16a-4234-075e">
+            <selectionEntryGroup id="171a-8ac6-f92f-cfee" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="0953-e16a-4234-075e" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5292-2a5d-823c-4bf8" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="de0d-d270-0f62-9cba" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="0953-e16a-4234-075e" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="0953-e16a-4234-075e" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -5691,7 +5665,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="63be-9068-aaa7-f8e2" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="2a70-a825-9e32-3149" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="2a70-a825-9e32-3149" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -5699,7 +5673,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="173c-60f5-25bd-bda8" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="ede3-870f-1269-f29b" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="ede3-870f-1269-f29b" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -5710,7 +5684,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="4691-fe4f-3d4e-f5d7" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="4691-fe4f-3d4e-f5d7" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -5723,13 +5697,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="3a78-4e4f-38ac-8695" name="Starbord" hidden="false" collective="false" import="true" defaultSelectionEntryId="3e29-24eb-8670-c803">
+            <selectionEntryGroup id="3a78-4e4f-38ac-8695" name="Starbord" hidden="false" collective="false" import="true" defaultSelectionEntryId="3e29-24eb-8670-c803" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1f77-28cc-a991-81da" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7bc7-10a2-8dcf-5ed0" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="3e29-24eb-8670-c803" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="3e29-24eb-8670-c803" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -5737,7 +5711,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="99da-9dc6-2093-141c" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="b5c0-fd90-a49c-cca2" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="b5c0-fd90-a49c-cca2" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -5745,7 +5719,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5c75-b395-0c1c-90a4" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="e973-6d5f-66a7-befd" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="e973-6d5f-66a7-befd" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -5756,7 +5730,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="1d2f-976e-8991-3927" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="1d2f-976e-8991-3927" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -5771,7 +5745,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="1978-dba0-17df-de35" name="Generators" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="1978-dba0-17df-de35" name="Generators" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="363b-53b6-a615-8a89" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="48c2-33b3-31f1-4384" type="max"/>
@@ -5810,31 +5784,41 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d8f6-ab96-f431-0ed3" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="d41d-7ea0-112b-b3c2" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6bfc-51ad-79d4-d254" type="max"/>
-              </constraints>
+            <entryLink import="true" name="Portal generator" hidden="false" id="bc3d-7f98-4a72-deb5" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+              <modifiers>
+                <modifier type="set" value="Portal generator (1)" field="name"/>
+                <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+              </modifiers>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
+              </costs>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="5f1e-b758-1026-eac6" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="5f1e-b758-1026-eac6" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="bd29-0d1f-faaf-7d94" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="bd29-0d1f-faaf-7d94" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Port First" hidden="false" id="1971-825a-6f13-008a" targetId="55de-fe5d-650a-2f4a" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="25c2-cc59-b9be-4913" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="25c2-cc59-b9be-4913" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Starboard First" hidden="false" id="2d68-6eec-d711-8efb" targetId="801-696b-9bb1-e4ef" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="7f82-8b46-aa75-40c8" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
+        <entryLink id="7f82-8b46-aa75-40c8" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="160"/>
@@ -5864,7 +5848,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="5dac-2ac5-f05f-6be5" name="Ikili Heavy Cruiser" hidden="false" targetId="9a89-b1c8-493b-66b4" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="4093-bdd0-5a24-b5d0" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="4093-bdd0-5a24-b5d0" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="6">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0374-9395-989c-0806" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2db9-e9ef-82c7-b6d5" type="max"/>
@@ -5876,7 +5860,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="77eb-ff15-c0f3-f763" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="43a2-9115-e8f7-8ddf" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="43a2-9115-e8f7-8ddf" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -5884,7 +5868,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ad7-b38c-7baa-5632" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="9f51-ad98-16e3-004e" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="9f51-ad98-16e3-004e" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -5892,7 +5876,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5108-8f6e-c089-f537" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="6003-d430-1337-971f" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="6003-d430-1337-971f" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -5903,7 +5887,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d930-9357-c1cb-8b88" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="d930-9357-c1cb-8b88" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -5922,7 +5906,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dc0d-7d79-d751-bff8" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="498e-3af3-2dae-d142" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="498e-3af3-2dae-d142" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -5930,7 +5914,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1bee-033b-3c79-6b7f" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="3e10-1156-74b6-4c4d" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="3e10-1156-74b6-4c4d" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -5938,7 +5922,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cf6b-0d11-54c9-4f85" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="674f-9d4c-6b4d-c8bf" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="674f-9d4c-6b4d-c8bf" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -5949,7 +5933,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="f686-3c08-997e-81e9" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="f686-3c08-997e-81e9" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -5964,7 +5948,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="c853-1d11-484d-586d" name="Secondary Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="c853-1d11-484d-586d" name="Secondary Weapon" hidden="false" collective="false" import="true" sortIndex="7">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2940-eb37-0145-e3a7" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a58f-5bef-de4e-af9e" type="max"/>
@@ -5976,7 +5960,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7ef0-4fd4-d1ed-5042" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="58ee-4353-e853-6bd3" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="58ee-4353-e853-6bd3" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -5984,7 +5968,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a8d2-5230-140f-0131" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="9185-92b4-ec17-62e2" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="9185-92b4-ec17-62e2" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -5992,7 +5976,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4910-d657-252c-11e8" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="cc1e-3d8c-9a02-a7d0" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="cc1e-3d8c-9a02-a7d0" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -6011,7 +5995,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bd16-6dea-0cbf-544d" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="b364-bbc0-60d0-09c3" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="b364-bbc0-60d0-09c3" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -6022,7 +6006,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="189d-0493-3554-2cce" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="189d-0493-3554-2cce" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -6030,7 +6014,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="daf8-73b4-6413-0bf4" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="3b5f-2341-7832-ec1d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="3b5f-2341-7832-ec1d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -6042,7 +6026,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="bdba-6f85-4ff9-86a7" name="Generators" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="bdba-6f85-4ff9-86a7" name="Generators" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e593-b454-e4d1-5122" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e794-3428-c480-62b4" type="max"/>
@@ -6051,61 +6035,71 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <categoryLink id="1e20-091c-29f5-a130" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
           </categoryLinks>
           <entryLinks>
-            <entryLink id="09fd-ceff-8365-b743" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry">
+            <entryLink id="09fd-ceff-8365-b743" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fb54-b2ee-4af2-8d23" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="0607-287f-82d0-6bee" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
+            <entryLink id="0607-287f-82d0-6bee" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0742-3890-8bfa-217a" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="7a9b-98f0-80cd-a599" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
+            <entryLink id="7a9b-98f0-80cd-a599" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="809e-5fbb-fb97-e6b1" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="f34d-88f3-e306-cbc9" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry">
+            <entryLink id="f34d-88f3-e306-cbc9" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry" sortIndex="4">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="676e-33b4-4506-c27d" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="f772-75a9-a31c-8967" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
+            <entryLink id="f772-75a9-a31c-8967" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry" sortIndex="6">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="26d9-9a8a-2aee-5838" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="7956-0305-aa20-5945" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
+            <entryLink id="7956-0305-aa20-5945" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry" sortIndex="7">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d347-e828-e83b-09d6" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="0518-2b31-b867-51e1" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="798e-9c8f-3801-f096" type="max"/>
-              </constraints>
+            <entryLink import="true" name="Portal generator" hidden="false" id="0173-568e-ef70-2ab4" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry" sortIndex="5">
+              <modifiers>
+                <modifier type="set" value="Portal generator (1)" field="name"/>
+                <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+              </modifiers>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
+              </costs>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="3490-8521-1de2-06af" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="3490-8521-1de2-06af" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="5ad9-0ef9-955a-a72d" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="5ad9-0ef9-955a-a72d" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Port First" hidden="false" id="a3a8-bb0b-4c48-d2b0" targetId="55de-fe5d-650a-2f4a" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="ae6d-93c6-d4b5-a5e1" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="ae6d-93c6-d4b5-a5e1" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Starboard First" hidden="false" id="dd60-f339-2b4f-9929" targetId="801-696b-9bb1-e4ef" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="1a60-aaf1-46e4-1139" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
+        <entryLink id="1a60-aaf1-46e4-1139" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="2"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="175"/>
@@ -6122,33 +6116,33 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="21ae-2e55-0851-062a" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="cfcd-8088-dcf5-efe0" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
         <infoLink id="1444-0ef3-fe72-a808" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="362e-eb23-1129-4c5c" name="Assigned Skiff Escort [3.06]" hidden="false" targetId="a04c-fb04-159e-ff33" type="rule"/>
+        <infoLink id="362e-eb23-1129-4c5c" name="Assigned Skiff Escort [3.07]" hidden="false" targetId="a04c-fb04-159e-ff33" type="rule"/>
         <infoLink id="c713-a5ae-6b91-fd0b" name="Advanced Repair Facilities (x) [3.07a]" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
           <modifiers>
             <modifier type="append" field="name" value="(2)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="dded-612f-7ff3-e1c7" name="Gun Runner [3.06]" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="dded-612f-7ff3-e1c7" name="Heavy Escort [3.07a]" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
         <infoLink id="b49b-5529-1587-0666" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="f425-4426-a3c3-2bef" name="Heavy Escort [3.07a]" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
         <infoLink id="3acd-fdd0-1188-aa44" name="Skiff Dock [3.06]" hidden="false" targetId="9c22-14a9-21ca-d77f" type="rule"/>
+        <infoLink id="9f1d-e0e7-83b2-813f" name="Gun Runner [3.06]" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="e8c5-eedc-0d80-a576" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="5136-34fa-0f1c-ad49" name="Maintenance Ship" hidden="false" targetId="0891-af18-b56a-58c8" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="6ffc-5e36-3876-8b19" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="6ffc-5e36-3876-8b19" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="915c-06c7-f6bf-a492" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="915c-06c7-f6bf-a492" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="ce9f-e591-976b-78a2" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="ce9f-e591-976b-78a2" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -6179,18 +6173,18 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="03a5-8b00-0c63-d035" name="Minelayer" hidden="false" targetId="fcf8-2a45-3c2e-fc65" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="d40d-17aa-a212-ade2" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="d40d-17aa-a212-ade2" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="4574-3bd6-73a8-9918" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="4574-3bd6-73a8-9918" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="bfd6-31df-b795-7197" name="Mirage generator" hidden="false" collective="false" import="true" targetId="163e-8002-bc82-d20f" type="selectionEntry"/>
-        <entryLink id="659c-6615-35e7-36b5" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="bfd6-31df-b795-7197" name="Mirage generator" hidden="false" collective="false" import="true" targetId="163e-8002-bc82-d20f" type="selectionEntry" sortIndex="1"/>
+        <entryLink id="659c-6615-35e7-36b5" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -6210,10 +6204,10 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="b621-fee9-c604-0c78" name="Abydos" hidden="false" targetId="24a4-9e2d-89cc-eb6e" type="profile"/>
         <infoLink id="adfd-d41b-3ab7-183f" name="Advanced Repair Facilities (x) [3.07a]" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
           <modifiers>
-            <modifier type="append" field="name" value="(4)"/>
+            <modifier type="set" field="name" value="Advanced Repair Facilities (4)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="0a3b-edea-f47b-3ba3" name="Assigned Skiff Escort [3.06]" hidden="false" targetId="a04c-fb04-159e-ff33" type="rule"/>
+        <infoLink id="0a3b-edea-f47b-3ba3" name="Assigned Skiff Escort [3.07]" hidden="false" targetId="a04c-fb04-159e-ff33" type="rule"/>
         <infoLink id="12ff-4754-4fb5-88cd" name="Large Target [3.07a]" hidden="false" targetId="5b16-04f1-a7a8-d2e0" type="rule"/>
         <infoLink id="1c33-1c35-c5b9-70bd" name="Heavy Escort [3.07a]" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
         <infoLink id="5b2b-0351-6fc1-c4fc" name="Skiff Dock [3.06]" hidden="false" targetId="9c22-14a9-21ca-d77f" type="rule"/>
@@ -6227,15 +6221,15 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="48bc-5cfa-237d-92af" name="Hover Stronghold" hidden="false" targetId="8ec7-65b5-6c0e-1f04" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="6ca9-5c41-5d30-9fae" name="Secondary Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="6ca9-5c41-5d30-9fae" name="Secondary Weapon" hidden="false" collective="false" import="true" sortIndex="5">
           <selectionEntryGroups>
-            <selectionEntryGroup id="6aa7-2880-4a1b-3a32" name="First Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="d632-650b-2c93-05cd">
+            <selectionEntryGroup id="6aa7-2880-4a1b-3a32" name="First Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="d632-650b-2c93-05cd" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7874-84de-1df3-c636" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0242-cc40-35aa-bdcc" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="282e-af8d-00b9-a5c1" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="282e-af8d-00b9-a5c1" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -6246,7 +6240,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d632-650b-2c93-05cd" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="d632-650b-2c93-05cd" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -6254,23 +6248,29 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d148-ad13-c294-38c0" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="2f86-4b42-4265-fec0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="2f86-4b42-4265-fec0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="34d2-bc85-7b62-dcf4" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port First" hidden="false" id="19a1-804d-c0ff-2e9c" targetId="55de-fe5d-650a-2f4a" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="2f02-6c1d-f72b-eb8a" name="First Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="29a7-3792-1c9c-5710">
+            <selectionEntryGroup id="2f02-6c1d-f72b-eb8a" name="First Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="29a7-3792-1c9c-5710" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="760a-74a7-6c62-f1e6" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="deca-a1cb-0d50-16d7" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="0922-cce7-6d6d-c90c" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="0922-cce7-6d6d-c90c" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -6281,7 +6281,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="29a7-3792-1c9c-5710" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="29a7-3792-1c9c-5710" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -6289,23 +6289,29 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d361-6110-03fc-2b04" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="7702-0de4-ba93-3538" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="7702-0de4-ba93-3538" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8693-c76e-6796-21ea" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Starboard First" hidden="false" id="e7e8-f188-eac2-a4df" targetId="801-696b-9bb1-e4ef" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="3b8a-b681-5640-772a" name="Second Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="b0ad-59d9-29d6-2b6c">
+            <selectionEntryGroup id="3b8a-b681-5640-772a" name="Second Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="b0ad-59d9-29d6-2b6c" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="57d0-3560-1529-5a86" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="87fa-340b-f674-d41c" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="abe9-26bf-5b94-0dea" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="abe9-26bf-5b94-0dea" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -6316,7 +6322,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="b0ad-59d9-29d6-2b6c" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="b0ad-59d9-29d6-2b6c" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -6324,23 +6330,29 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="30c4-95dc-7a4c-42a5" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="0e92-3e34-f12b-642c" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="0e92-3e34-f12b-642c" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a9ae-5423-b379-636c" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port Second" hidden="false" id="7100-7b49-3850-2410" targetId="e1e9-a88-1bb-b8aa" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="b793-5f60-a17f-9349" name="Third Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="2f3a-02d7-b2dc-fc7a">
+            <selectionEntryGroup id="b793-5f60-a17f-9349" name="Third Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="2f3a-02d7-b2dc-fc7a" sortIndex="5">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8c56-c644-088e-2dea" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c5c2-a5ad-f85b-5af9" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="5db9-8a57-a759-dd94" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="5db9-8a57-a759-dd94" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -6351,7 +6363,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="2f3a-02d7-b2dc-fc7a" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="2f3a-02d7-b2dc-fc7a" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -6359,23 +6371,29 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a289-76a0-0805-c39f" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="359f-6653-b282-697d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="359f-6653-b282-697d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8b9c-ad42-fce9-c4fb" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port Third" hidden="false" id="5eb7-05bd-01b3-99ac" targetId="0c23-0110-ee82-8551" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="504a-eed8-8784-9c06" name="Second Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="b05a-1864-2426-770a">
+            <selectionEntryGroup id="504a-eed8-8784-9c06" name="Second Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="b05a-1864-2426-770a" sortIndex="4">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fee2-6ab5-098c-abe2" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f5b8-6124-f418-d8af" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="f12b-b1f0-78f0-43d6" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="f12b-b1f0-78f0-43d6" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -6386,7 +6404,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="b05a-1864-2426-770a" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="b05a-1864-2426-770a" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -6394,23 +6412,29 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a2a3-9826-1485-9644" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="de23-2bd2-f462-0216" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="de23-2bd2-f462-0216" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0541-e1f4-c56f-c14a" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Starboard Second" hidden="false" id="6655-bfb6-6f9b-7468" targetId="a036-e1b6-ee86-ebf7" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="2b41-d69c-5cdc-9f9a" name="Third Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="26f3-b3c8-cebe-46e9">
+            <selectionEntryGroup id="2b41-d69c-5cdc-9f9a" name="Third Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="26f3-b3c8-cebe-46e9" sortIndex="6">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4e28-5d50-3f73-d3f0" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="24eb-aad3-95ac-dc5d" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="cf35-25bf-602f-52a0" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="cf35-25bf-602f-52a0" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -6421,7 +6445,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="26f3-b3c8-cebe-46e9" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="26f3-b3c8-cebe-46e9" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -6429,25 +6453,31 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8e8a-af23-e559-61f9" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="fa1b-31b9-2762-f640" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="fa1b-31b9-2762-f640" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="37e3-1192-2afc-55ef" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Starboard Third" hidden="false" id="6b42-2ac4-9b95-adeb" targetId="cbe3-a4d6-4d7d-9a4c" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="0fbc-bad8-c94f-8604" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" defaultSelectionEntryId="eed0-204f-dcad-8401">
+        <selectionEntryGroup id="0fbc-bad8-c94f-8604" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" defaultSelectionEntryId="eed0-204f-dcad-8401" sortIndex="4">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c807-8f18-9ef3-a546" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="67d9-4b27-7fd2-726a" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="e98c-1098-2dbe-69cf" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+            <entryLink id="e98c-1098-2dbe-69cf" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
               </modifiers>
@@ -6458,7 +6488,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="4"/>
               </costs>
             </entryLink>
-            <entryLink id="9d84-b951-a1c0-3abb" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+            <entryLink id="9d84-b951-a1c0-3abb" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
               </modifiers>
@@ -6466,7 +6496,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8194-5d76-893f-5123" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="eed0-204f-dcad-8401" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+            <entryLink id="eed0-204f-dcad-8401" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
               </modifiers>
@@ -6474,7 +6504,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5288-b542-ebed-3dee" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="3d97-9026-127c-4ab0" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+            <entryLink id="3d97-9026-127c-4ab0" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
               </modifiers>
@@ -6489,17 +6519,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="2820-51b4-cb4e-35b9" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry">
+        <entryLink id="2820-51b4-cb4e-35b9" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
         </entryLink>
-        <entryLink id="4974-be1e-d5c6-6a94" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="4974-be1e-d5c6-6a94" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink import="true" name="Torpedo Salvo" hidden="false" id="ba41-97a1-ae85-5303" collective="false" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink import="true" name="Torpedo Salvo" hidden="false" id="ba41-97a1-ae85-5303" collective="false" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" value="dbb4-72d5-bceb-70b3" field="category"/>
           </modifiers>
@@ -6525,7 +6555,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="a894-1c2a-968a-f75f" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="4d1b-c3fb-b7e2-e8c9" name="SRS Mine Clearance [3.07a]" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
         <infoLink id="e39e-3eaa-66f2-f5cc" name="SRS Recon [3.07a]" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="8c8a-53f1-ce02-c66d" name="SRS Portal Strike [3.06]" hidden="false" targetId="e76e-276f-d917-c7a4" type="rule"/>
+        <infoLink id="8c8a-53f1-ce02-c66d" name="SRS Portal Strike [3.07]" hidden="false" targetId="e76e-276f-d917-c7a4" type="rule"/>
         <infoLink id="3b10-56f4-7c25-7ad2" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -6533,7 +6563,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="fbf6-a773-44fa-6215" name="Portal-Strike Carrier" hidden="false" targetId="741e-8911-df70-fba0" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="d78f-7574-0b6c-2327" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="d78f-7574-0b6c-2327" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="upgrade" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f4fa-ca0f-30a1-5341" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f3e7-ea7a-0691-1083" type="max"/>
@@ -6552,33 +6582,50 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntry>
       </selectionEntries>
       <entryLinks>
-        <entryLink id="12ef-ffad-855e-71fd" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="12ef-ffad-855e-71fd" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="5e6e-49da-980f-7c12" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="5e6e-49da-980f-7c12" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="7">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="1st" hidden="false" id="79d6-b347-8ee0-21d9" targetId="8dd5-28b8-39fb-6304" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="d83f-8b1f-88ed-ef2f" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink id="d83f-8b1f-88ed-ef2f" name="Torpedo Salvo" hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="8">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="2nd" hidden="false" id="c416-e81f-6d90-b8fd" targetId="2a6f-36d6-5d75-e9fc" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="57a5-5036-a73e-ee2d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
-        <entryLink id="8aff-635e-537c-aa2e" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="57a5-5036-a73e-ee2d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="2"/>
+        <entryLink id="8aff-635e-537c-aa2e" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="1st" hidden="false" id="2a88-d4c5-99c2-9be8" targetId="8dd5-28b8-39fb-6304" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="74b0-54c7-9e61-13dc" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="74b0-54c7-9e61-13dc" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="2nd" hidden="false" id="05c4-3dd4-2511-c94f" targetId="2a6f-36d6-5d75-e9fc" primary="false"/>
+          </categoryLinks>
+        </entryLink>
+        <entryLink import="true" name="Portal generator" hidden="false" id="9023-c339-12f1-3c87" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="1">
+          <modifiers>
+            <modifier type="set" value="Portal generator (2)" field="name"/>
+            <modifier type="add" value="8901-cc02-f55e-2ee5" field="category"/>
+          </modifiers>
         </entryLink>
-        <entryLink id="1ed1-ed3c-0919-7ecb" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="245"/>
@@ -6594,7 +6641,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="a445-73f1-0590-52c7" name="Benghazi" hidden="false" targetId="2996-9074-0c55-7f42" type="profile"/>
         <infoLink id="0763-8156-8118-8bd5" name="Advanced Repair Facilities (x) [3.07a]" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
           <modifiers>
-            <modifier type="append" field="name" value="(2)"/>
+            <modifier type="set" field="name" value="Advanced Repair Facilities (2)"/>
           </modifiers>
         </infoLink>
         <infoLink id="a61e-fad2-b70b-c258" name="Forward Deployment [3.07a]" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
@@ -6615,13 +6662,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b0a8-433a-bf2f-181c" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="9570-066f-0290-830f" name="First" hidden="false" collective="false" import="true" defaultSelectionEntryId="f8bf-626a-d83a-6c69">
+            <selectionEntryGroup id="9570-066f-0290-830f" name="First" hidden="false" collective="false" import="true" defaultSelectionEntryId="f8bf-626a-d83a-6c69" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9a20-cd5c-fd3c-d23e" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fdd6-acc9-a860-a9b7" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="f8bf-626a-d83a-6c69" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="f8bf-626a-d83a-6c69" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
                   </modifiers>
@@ -6629,7 +6676,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6023-d0c0-ccb3-0dec" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="e90b-01ff-6dac-bb8c" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="e90b-01ff-6dac-bb8c" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
                   </modifiers>
@@ -6637,7 +6684,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="419a-a4b4-f804-8b0b" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="bd43-f4e4-2512-7105" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="bd43-f4e4-2512-7105" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
                   </modifiers>
@@ -6645,18 +6692,21 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7945-674e-178c-43f8" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="6"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="1st" hidden="false" id="d92c-860a-83fb-6f72" targetId="8dd5-28b8-39fb-6304" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="4f4b-bf9b-e1e6-0888" name="Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="c710-447b-2f64-9e47">
+            <selectionEntryGroup id="4f4b-bf9b-e1e6-0888" name="Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="c710-447b-2f64-9e47" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="61d7-626c-c82c-2b14" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9d05-337f-6a6b-06aa" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="c710-447b-2f64-9e47" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="c710-447b-2f64-9e47" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
                   </modifiers>
@@ -6664,7 +6714,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4324-c721-7c6f-eb0d" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="573d-3b9d-1c20-b567" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="573d-3b9d-1c20-b567" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
                   </modifiers>
@@ -6672,7 +6722,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b377-6ad9-96e8-1f89" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="b431-ab21-cf58-23d7" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="b431-ab21-cf58-23d7" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
                   </modifiers>
@@ -6680,10 +6730,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3f80-147a-bb79-db29" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="6"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="2nd" hidden="false" id="a308-c538-adb3-36a1" targetId="2a6f-36d6-5d75-e9fc" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
@@ -6710,13 +6763,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="ec4e-829a-2886-c10f" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="b7f9-f52c-c313-786c" name="Secondary Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="b7f9-f52c-c313-786c" name="Secondary Weapon" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d3c7-af8d-1742-1237" type="min"/>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a6dd-fb00-b781-72e8" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="bdbf-369d-efa2-8b25" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+            <entryLink id="bdbf-369d-efa2-8b25" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
               </modifiers>
@@ -6740,13 +6793,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
-        <selectionEntryGroup id="d7f8-6beb-d33d-b8cf" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="bf6b-14b1-5b43-82dc">
+        <selectionEntryGroup id="d7f8-6beb-d33d-b8cf" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="bf6b-14b1-5b43-82dc" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3958-103e-e3cf-806a" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3252-46aa-2613-070d" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="bf6b-14b1-5b43-82dc" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+            <entryLink id="bf6b-14b1-5b43-82dc" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
               <modifiers>
                 <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
               </modifiers>
@@ -6754,7 +6807,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="91ae-67ad-ca90-3ab0" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="c872-c090-b0e0-0100" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+            <entryLink id="c872-c090-b0e0-0100" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
               <modifiers>
                 <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
               </modifiers>
@@ -6765,7 +6818,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
               </costs>
             </entryLink>
-            <entryLink id="dab3-7250-c6ca-ddab" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+            <entryLink id="dab3-7250-c6ca-ddab" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
               <modifiers>
                 <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
               </modifiers>
@@ -6773,7 +6826,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d7d4-bcb1-ff6e-d143" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink id="cc7b-f5f4-71ed-8c1c" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+            <entryLink id="cc7b-f5f4-71ed-8c1c" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
               <modifiers>
                 <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
               </modifiers>
@@ -6809,7 +6862,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="c564-f71c-a281-278a" name="Heavy Platform" hidden="false" targetId="fbfb-0ffd-73fa-8e0a" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="539b-65ee-f7a0-2aac" name="Secondary Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="539b-65ee-f7a0-2aac" name="Secondary Weapon" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fd47-9763-0db5-beba" type="min"/>
             <constraint field="selections" scope="parent" value="4" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5ef1-ae82-f4a8-3a9f" type="max"/>
@@ -6836,7 +6889,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10"/>
                       </costs>
                     </entryLink>
-                    <entryLink id="9e53-f5a4-5e2c-84ab" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                    <entryLink id="9e53-f5a4-5e2c-84ab" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                       <modifiers>
                         <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                       </modifiers>
@@ -6848,6 +6901,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                       </costs>
                     </entryLink>
                   </entryLinks>
+                  <categoryLinks>
+                    <categoryLink name="1st" hidden="false" id="8484-442f-d090-b832" targetId="8dd5-28b8-39fb-6304" primary="false"/>
+                  </categoryLinks>
                 </selectionEntryGroup>
                 <selectionEntryGroup id="9ebb-3f9c-c5b2-e2c6" name="Second" hidden="false" collective="false" import="true">
                   <constraints>
@@ -6862,7 +6918,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10"/>
                       </costs>
                     </entryLink>
-                    <entryLink id="547a-083f-6556-5307" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                    <entryLink id="547a-083f-6556-5307" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                       <modifiers>
                         <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                       </modifiers>
@@ -6871,6 +6927,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                       </costs>
                     </entryLink>
                   </entryLinks>
+                  <categoryLinks>
+                    <categoryLink name="2nd" hidden="false" id="bda7-0812-e0b6-1040" targetId="2a6f-36d6-5d75-e9fc" primary="false"/>
+                  </categoryLinks>
                 </selectionEntryGroup>
               </selectionEntryGroups>
             </selectionEntryGroup>
@@ -6895,7 +6954,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10"/>
                       </costs>
                     </entryLink>
-                    <entryLink id="4e83-ac3f-32f1-7c03" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                    <entryLink id="4e83-ac3f-32f1-7c03" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                       <modifiers>
                         <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                       </modifiers>
@@ -6907,6 +6966,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                       </costs>
                     </entryLink>
                   </entryLinks>
+                  <categoryLinks>
+                    <categoryLink name="1st" hidden="false" id="c9c4-8a24-622b-cd9c" targetId="8dd5-28b8-39fb-6304" primary="false"/>
+                  </categoryLinks>
                 </selectionEntryGroup>
                 <selectionEntryGroup id="dff0-5f71-18ac-8928" name="Second" hidden="false" collective="false" import="true">
                   <constraints>
@@ -6924,7 +6986,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10"/>
                       </costs>
                     </entryLink>
-                    <entryLink id="c8d0-e083-49ee-336c" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                    <entryLink id="c8d0-e083-49ee-336c" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                       <modifiers>
                         <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                       </modifiers>
@@ -6936,6 +6998,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                       </costs>
                     </entryLink>
                   </entryLinks>
+                  <categoryLinks>
+                    <categoryLink name="2nd" hidden="false" id="33de-e7fe-b7fa-de91" targetId="2a6f-36d6-5d75-e9fc" primary="false"/>
+                  </categoryLinks>
                 </selectionEntryGroup>
               </selectionEntryGroups>
             </selectionEntryGroup>
@@ -6960,7 +7025,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10"/>
                       </costs>
                     </entryLink>
-                    <entryLink id="32c9-80ab-00a0-e210" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                    <entryLink id="32c9-80ab-00a0-e210" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                       <modifiers>
                         <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                       </modifiers>
@@ -6972,6 +7037,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                       </costs>
                     </entryLink>
                   </entryLinks>
+                  <categoryLinks>
+                    <categoryLink name="1st" hidden="false" id="1a70-198a-b08b-a3f5" targetId="8dd5-28b8-39fb-6304" primary="false"/>
+                  </categoryLinks>
                 </selectionEntryGroup>
                 <selectionEntryGroup id="4fc2-8035-84c4-3595" name="Second" hidden="false" collective="false" import="true">
                   <constraints>
@@ -6989,7 +7057,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10"/>
                       </costs>
                     </entryLink>
-                    <entryLink id="577a-4457-ab36-515b" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                    <entryLink id="577a-4457-ab36-515b" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                       <modifiers>
                         <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                       </modifiers>
@@ -7001,12 +7069,15 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                       </costs>
                     </entryLink>
                   </entryLinks>
+                  <categoryLinks>
+                    <categoryLink name="2nd" hidden="false" id="7efd-f6cd-adba-0d71" targetId="2a6f-36d6-5d75-e9fc" primary="false"/>
+                  </categoryLinks>
                 </selectionEntryGroup>
               </selectionEntryGroups>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="6b20-4893-94ae-52ac" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="6b20-4893-94ae-52ac" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4a8d-6c98-bde5-9afa" type="min"/>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a6e2-8e34-867f-fee3" type="max"/>
@@ -7018,7 +7089,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1b92-fd1e-3c92-1fb2" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="ed27-4286-54e1-9d3d" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="ed27-4286-54e1-9d3d" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7026,7 +7097,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b995-ec5a-1af1-ef62" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="f9ca-37fd-936a-66ff" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="f9ca-37fd-936a-66ff" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7037,7 +7108,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="9f7f-257a-4aa1-3571" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="9f7f-257a-4aa1-3571" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7045,7 +7116,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="41b9-3998-2400-7ad8" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="15c5-ae9b-836b-2699" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="15c5-ae9b-836b-2699" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7064,7 +7135,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="21f4-8a16-8a42-f482" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="a25c-1d6d-b5c4-04f1" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="a25c-1d6d-b5c4-04f1" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -7072,7 +7143,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9323-d465-9778-e140" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="d61a-41e1-58fc-d9d6" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="d61a-41e1-58fc-d9d6" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -7080,7 +7151,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ae70-64d5-54cd-95df" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="f4ce-d9d0-2efb-e972" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="f4ce-d9d0-2efb-e972" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -7091,7 +7162,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="1bf5-707d-0ff5-30d0" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="1bf5-707d-0ff5-30d0" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -7110,7 +7181,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c649-b3f2-d9e9-2d7b" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="1c69-7618-63b4-ec97" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="1c69-7618-63b4-ec97" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -7118,7 +7189,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8cae-4ee0-fd8a-40c1" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="f349-b028-a644-412a" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="f349-b028-a644-412a" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -7126,7 +7197,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7969-6bb5-b1cb-669e" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="08a3-4a00-b28d-553e" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="08a3-4a00-b28d-553e" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -7137,7 +7208,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="6539-21f4-1b7e-6502" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="6539-21f4-1b7e-6502" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -7152,15 +7223,16 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="4fe8-6c47-02c3-faac" name="Generator" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="4fe8-6c47-02c3-faac" name="Generator" hidden="false" collective="false" import="true" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6ca3-6866-7b9b-c183" type="max"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="38c4-f2f3-adb4-c163" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
           </constraints>
           <categoryLinks>
             <categoryLink id="f497-5d6c-95aa-2baf" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
           </categoryLinks>
           <entryLinks>
-            <entryLink id="c55b-38e1-ce3b-76d6" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
+            <entryLink id="c55b-38e1-ce3b-76d6" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="54be-99fe-09ee-d8c8" type="max"/>
               </constraints>
@@ -7168,7 +7240,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="25"/>
               </costs>
             </entryLink>
-            <entryLink id="5674-5e68-f93b-408c" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
+            <entryLink id="5674-5e68-f93b-408c" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d2f9-34dd-25bc-d72d" type="max"/>
               </constraints>
@@ -7176,7 +7248,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="25"/>
               </costs>
             </entryLink>
-            <entryLink id="bac2-d63c-6329-0b02" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
+            <entryLink id="bac2-d63c-6329-0b02" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry" sortIndex="4">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="df5a-daa6-d719-825b" type="max"/>
               </constraints>
@@ -7184,13 +7256,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="25"/>
               </costs>
             </entryLink>
-            <entryLink id="d9a4-d06e-d3dd-24ec" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b5a-1942-40ce-6b32" type="max"/>
-              </constraints>
+            <entryLink import="true" name="Portal generator" hidden="false" id="5b67-4847-28d6-eb14" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry" sortIndex="2">
+              <modifiers>
+                <modifier type="set" value="Portal generator (1)" field="name"/>
+                <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+              </modifiers>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="25"/>
               </costs>
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="2430-fb41-2e81-7e88" includeChildSelections="false"/>
+              </constraints>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
@@ -7210,29 +7286,29 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="966a-015c-a5d2-1779" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
         <infoLink id="2af5-9fe1-fb21-fa9c" name="Kopesh" hidden="false" targetId="5aa6-c6ee-6cf9-e716" type="profile"/>
         <infoLink id="71c9-803b-f20d-7ab0" name="Mine Sweeper [3.07a]" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
-        <infoLink id="a038-193b-7e69-3f0a" name="Shadow Hunter [3.07a]" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
-        <infoLink id="705b-dd19-1b05-e67b" name="Hydrophone Relay [3.07a]" hidden="false" targetId="1b80-20ba-6dae-7094" type="rule"/>
+        <infoLink id="705b-dd19-1b05-e67b" name="Deceptive Deployment [3.06a]" hidden="false" targetId="fd5a-cf78-1cd5-6c63" type="rule"/>
         <infoLink id="6b2d-15ca-60d2-565e" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="cd1a-3f7e-c130-8226" name="Vanguard [3.07a]" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
+        <infoLink id="73d5-c066-7ea6-4317" name="Hydrophone Relay [3.07a]" hidden="false" targetId="1b80-20ba-6dae-7094" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="3931-ac84-1c05-bdde" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink name="Scout Skimmer" hidden="false" id="8f93-a14d-a95e-c65" targetId="5bb5-4129-acb5-d9f2" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="a2a1-3717-e479-1b92" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="a2a1-3717-e479-1b92" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="2">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f0a2-e496-b9bd-4b00" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c2f7-c6b5-6326-84ab" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="f403-535e-b360-b152" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="d81c-c73f-403a-df6c">
+            <selectionEntryGroup id="f403-535e-b360-b152" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="d81c-c73f-403a-df6c" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c496-6bbc-083d-7b70" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cb04-ad68-512b-c03a" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="a379-4665-2f08-2ba1" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="a379-4665-2f08-2ba1" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7243,7 +7319,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d81c-c73f-403a-df6c" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="d81c-c73f-403a-df6c" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7251,7 +7327,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e373-5ffd-f43e-cee7" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="c99e-c694-442e-9293" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="c99e-c694-442e-9293" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7261,13 +7337,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="bdea-2edd-6c0d-cfa6" name="Rear" hidden="false" collective="false" import="true" defaultSelectionEntryId="6b76-4b94-1bd9-4e05">
+            <selectionEntryGroup id="bdea-2edd-6c0d-cfa6" name="Rear" hidden="false" collective="false" import="true" defaultSelectionEntryId="6b76-4b94-1bd9-4e05" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0a81-a587-2dd0-94b6" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3f66-7878-6910-5da0" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7636-f093-ec40-b0b1" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="7636-f093-ec40-b0b1" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -7278,7 +7354,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="6b76-4b94-1bd9-4e05" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="6b76-4b94-1bd9-4e05" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -7286,7 +7362,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fba5-847b-67d1-9c2e" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="c6d2-2916-f52f-a955" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="c6d2-2916-f52f-a955" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -7300,7 +7376,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="b42e-3f25-08b1-7789" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry">
+        <entryLink id="b42e-3f25-08b1-7789" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
@@ -7320,14 +7396,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="05e5-c717-75e2-2248" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="a32a-d604-0172-3bd8" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
         <infoLink id="ddf7-dd5d-bf6b-a514" name="Mandjet" hidden="false" targetId="c8ca-df09-bf4a-a1e2" type="profile"/>
-        <infoLink id="e68f-8657-cbb4-593e" name="Focused Gunnery [3.06]" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="e68f-8657-cbb4-593e" name="Bombardment (x) [3.06a]" hidden="false" targetId="fae5-d154-470a-ac54" type="rule">
+          <modifiers>
+            <modifier type="set" value="Bombardment (Magnetic)" field="name"/>
+          </modifiers>
+        </infoLink>
+        <infoLink id="927c-0afb-37d8-0b5a" name="Spotter [3.07a]" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="e57e-e6eb-2ca4-0b74" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="63be-df26-589a-e099" name="Heavy Skimmer" hidden="false" targetId="c9ae-fb5d-a2d1-4b26" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="905e-8557-16c7-db9a" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="905e-8557-16c7-db9a" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aaa5-9edc-86d4-958c" type="max"/>
           </constraints>
@@ -7339,28 +7420,28 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
               </modifiers>
             </infoLink>
             <infoLink id="d015-e283-5189-f69d" name="Khepri SRS Tokens [3.06]" hidden="false" targetId="a0d9-f4d0-a016-2331" type="rule"/>
-            <infoLink id="397a-bf28-811a-9189" name="Khepri SRS Capacity [3.06]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
+            <infoLink id="397a-bf28-811a-9189" name="Khepri SRS Capacity [3.07]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
           </infoLinks>
           <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15"/>
+            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10"/>
             <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
-        <selectionEntryGroup id="f92e-a277-f3cd-289b" name="Secondary Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="f92e-a277-f3cd-289b" name="Secondary Weapon" hidden="false" collective="false" import="true" sortIndex="5">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b6c-3495-389a-0631" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e5f4-3225-bc7a-6c3e" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="0797-e145-14fe-8ed7" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="acaa-cb75-5dee-9522">
+            <selectionEntryGroup id="0797-e145-14fe-8ed7" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="acaa-cb75-5dee-9522" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="de85-d371-e453-54cb" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="816f-74cd-2664-193b" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="a8d9-8412-1634-211e" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="a8d9-8412-1634-211e" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7395,7 +7476,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b721-1539-e6ab-552b" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="a138-1045-3333-3be9" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="a138-1045-3333-3be9" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7426,13 +7507,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="ea0a-539f-888f-5556" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="ea0a-539f-888f-5556" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="4">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1d6e-843f-448f-cd97" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="08bb-2b82-36fc-4560" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="3981-0e30-d7ae-384e" name="Generator" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="3981-0e30-d7ae-384e" name="Generator" hidden="false" collective="false" import="true" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="da62-fa06-65cb-32bf" type="max"/>
               </constraints>
@@ -7472,14 +7553,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d08d-8a3a-d210-5c56" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="47e2-e3a0-cac4-1ba3" type="max"/>
-                  </constraints>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
-                  </costs>
-                </entryLink>
                 <entryLink id="dd6c-3a80-c578-e91c" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dc5b-3ae4-c03f-0451" type="max"/>
@@ -7496,9 +7569,18 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
+                <entryLink import="true" name="Portal generator" hidden="false" id="c80f-1693-c046-5ce6" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" value="Portal generator (1)" field="name"/>
+                    <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+                  </modifiers>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="fefb-5928-f294-3694" name="Front" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="bc54-38c0-4e9f-0c49">
+            <selectionEntryGroup id="fefb-5928-f294-3694" name="Front" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="bc54-38c0-4e9f-0c49" sortIndex="1">
               <modifiers>
                 <modifier type="set" field="7827-9911-5a16-4088" value="0">
                   <conditions>
@@ -7538,7 +7620,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fcab-6eed-805a-f012" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="6272-a4f3-0296-e4a9" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="6272-a4f3-0296-e4a9" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7555,19 +7637,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="3970-a52a-da5f-9917" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="3970-a52a-da5f-9917" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="94b0-302d-46e7-7172" name="Heavy Magnetic Bombard" hidden="false" collective="false" import="true" targetId="8cc0-9c4e-e741-ff9c" type="selectionEntry">
+        <entryLink id="94b0-302d-46e7-7172" name="Qaa Magnetic Bombard" hidden="false" collective="false" import="true" targetId="f58d-4ccc-5b7f-898e" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="138"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="133"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
@@ -7587,7 +7669,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="e320-b68f-037a-747a" name="Strike Skimmer" hidden="false" targetId="5b5c-b5fc-33af-c4ac" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="e78d-ab61-820d-6ee5" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="e78d-ab61-820d-6ee5" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="07b5-e61b-3a58-7946" type="max"/>
           </constraints>
@@ -7599,10 +7681,10 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
               </modifiers>
             </infoLink>
             <infoLink id="b258-2a1d-2823-a91b" name="Khepri SRS Tokens [3.06]" hidden="false" targetId="a0d9-f4d0-a016-2331" type="rule"/>
-            <infoLink id="bef0-4e1d-5753-dc2a" name="Khepri SRS Capacity [3.06]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
+            <infoLink id="bef0-4e1d-5753-dc2a" name="Khepri SRS Capacity [3.07]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
           </infoLinks>
           <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20"/>
+            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15"/>
             <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
           </costs>
         </selectionEntry>
@@ -7620,7 +7702,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e1bd-1567-a88d-2983" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7638-7aea-c58b-7910" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="7638-7aea-c58b-7910" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7631,7 +7713,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d1de-bf63-0c5d-1263" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="d1de-bf63-0c5d-1263" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7639,7 +7721,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7395-2ae2-2bc9-7cf7" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="31ef-314b-aa99-ff13" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="31ef-314b-aa99-ff13" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7655,7 +7737,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="abcb-20c3-a78c-c01b" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="2b96-d13f-eaa6-5e69" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="2b96-d13f-eaa6-5e69" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7666,7 +7748,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="699e-7203-d410-313f" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="699e-7203-d410-313f" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7674,7 +7756,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1be8-0f09-c7ab-9b72" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="fc55-c699-14b0-392c" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="fc55-c699-14b0-392c" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7690,7 +7772,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8143-bf15-aa6a-2e93" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="33d9-e82a-4a91-a6d2" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="33d9-e82a-4a91-a6d2" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7701,7 +7783,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="4996-0f0f-5e1b-c57e" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="4996-0f0f-5e1b-c57e" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7709,7 +7791,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d53b-ff8b-a3fe-4178" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="ec24-4029-06a3-cbaf" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="ec24-4029-06a3-cbaf" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -7723,12 +7805,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="bb18-361f-24af-7c51" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="bb18-361f-24af-7c51" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="2a21-dc26-96de-5c10" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
+        <entryLink id="2a21-dc26-96de-5c10" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -7747,7 +7829,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <infoLinks>
         <infoLink id="12ba-c381-5adc-114e" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="8ad1-d63d-091d-4029" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="fbd6-28b2-730b-c874" name="Rocket Barrage [3.06]" hidden="false" targetId="1042-355a-94f3-b6be" type="rule"/>
+        <infoLink id="fbd6-28b2-730b-c874" name="Bombardment (x) [3.06a]" hidden="false" targetId="fae5-d154-470a-ac54" type="rule">
+          <modifiers>
+            <modifier type="set" value="Bombardment (Aerial)" field="name"/>
+          </modifiers>
+        </infoLink>
         <infoLink id="8e74-ad72-5738-d090" name="Sabah" hidden="false" targetId="9ab5-7356-9a2e-dcb1" type="profile"/>
         <infoLink id="856e-b4fa-9da0-6541" name="Spotter [3.07a]" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
       </infoLinks>
@@ -7756,7 +7842,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="12ff-3e22-181f-4f2c" name="Barrage Skimmer" hidden="false" targetId="6d4f-1760-b3f6-edcf" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="4adb-95e1-ee2d-8e10" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="4adb-95e1-ee2d-8e10" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d14d-409a-4782-c8b1" type="max"/>
           </constraints>
@@ -7768,16 +7854,16 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
               </modifiers>
             </infoLink>
             <infoLink id="fe08-205b-948c-2c62" name="Khepri SRS Tokens [3.06]" hidden="false" targetId="a0d9-f4d0-a016-2331" type="rule"/>
-            <infoLink id="e256-2a83-2e44-d965" name="Khepri SRS Capacity [3.06]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
+            <infoLink id="e256-2a83-2e44-d965" name="Khepri SRS Capacity [3.07]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
           </infoLinks>
           <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15"/>
+            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10"/>
             <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
-        <selectionEntryGroup id="0eeb-60eb-c494-6d94" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="0eeb-60eb-c494-6d94" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="5">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ad69-a261-823a-d24d" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2efa-0a19-2279-ed1a" type="max"/>
@@ -7789,7 +7875,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f552-4820-9ac6-7da4" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="9706-3417-0f56-f97a" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="9706-3417-0f56-f97a" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7800,7 +7886,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="5e67-c438-4021-d28a" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="5e67-c438-4021-d28a" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7808,7 +7894,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0721-506f-6903-d485" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="489f-d225-6ae1-82b0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="489f-d225-6ae1-82b0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7824,7 +7910,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c145-af65-c631-9b1a" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="bdb9-05fa-ed6f-6ec1" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="bdb9-05fa-ed6f-6ec1" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7835,7 +7921,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="ba0a-e86d-6bc3-e5d4" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="ba0a-e86d-6bc3-e5d4" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7857,17 +7943,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="165a-6b54-c1d2-62eb" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="165a-6b54-c1d2-62eb" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="5f4c-f067-0b97-2fcf" name="Salvo Missile Silo" hidden="false" collective="false" import="true" targetId="6a66-1016-ae4a-e291" type="selectionEntry">
+        <entryLink id="5f4c-f067-0b97-2fcf" name="Salvo Missile Silo" hidden="false" collective="false" import="true" targetId="6a66-1016-ae4a-e291" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
         </entryLink>
-        <entryLink import="true" name="Torpedo Salvo" hidden="false" id="fe71-b056-b174-866b" collective="false" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink import="true" name="Torpedo Salvo" hidden="false" id="fe71-b056-b174-866b" collective="false" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" value="dbb4-72d5-bceb-70b3" field="category"/>
           </modifiers>
@@ -7886,7 +7972,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <infoLinks>
         <infoLink id="22a9-7f18-ce4d-2d1f" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="37ca-bfc4-5b87-327f" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="cd5e-d8f9-24bc-5b92" name="Coastal Bombardment [3.07a]" hidden="false" targetId="50d4-3fc7-f4ae-9736" type="rule"/>
+        <infoLink id="cd5e-d8f9-24bc-5b92" name="Focused Fire (x) [3.07a]" hidden="false" targetId="6c94-ad2b-60d8-2c4f" type="rule">
+          <modifiers>
+            <modifier type="set" value="Focused Fire (Gunnery)" field="name"/>
+          </modifiers>
+        </infoLink>
         <infoLink id="0812-f676-3a62-2bc8" name="Mine Layer [3.07a]" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
         <infoLink id="3655-b2cf-b713-12c1" name="Sobek" hidden="false" targetId="c4c5-685d-48e6-7e87" type="profile"/>
         <infoLink id="fb4e-aeea-40ab-86ac" name="Landing Vessel [3.07a]" hidden="false" targetId="4869-03db-33f9-fa82" type="rule"/>
@@ -7896,7 +7986,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="8e0f-cd4a-993a-0d03" name="Coastal Skimmer" hidden="false" targetId="cb64-2db5-2cc6-c70b" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="137b-bf5a-cf57-7e24" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="137b-bf5a-cf57-7e24" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="74da-b1ea-e04d-15b2" type="max"/>
           </constraints>
@@ -7908,28 +7998,28 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
               </modifiers>
             </infoLink>
             <infoLink id="b60b-6631-836a-5ce1" name="Khepri SRS Tokens [3.06]" hidden="false" targetId="a0d9-f4d0-a016-2331" type="rule"/>
-            <infoLink id="df04-069c-c60b-4db3" name="Khepri SRS Capacity [3.06]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
+            <infoLink id="df04-069c-c60b-4db3" name="Khepri SRS Capacity [3.07]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
           </infoLinks>
           <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20"/>
+            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12"/>
             <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
-        <selectionEntryGroup id="4d44-564e-b206-bf5f" name="Secondary Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="4d44-564e-b206-bf5f" name="Secondary Weapon" hidden="false" collective="false" import="true" sortIndex="4">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3688-ef2b-6041-829e" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a633-5203-deb9-e390" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="ce2a-a8ad-4428-5558" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="4998-30b1-68ff-6847">
+            <selectionEntryGroup id="ce2a-a8ad-4428-5558" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="4998-30b1-68ff-6847" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2599-8335-a82f-c7b6" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="64f5-c728-ad04-e058" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="87ea-dfdf-249b-d62a" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="87ea-dfdf-249b-d62a" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7940,7 +8030,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="4998-30b1-68ff-6847" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="4998-30b1-68ff-6847" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7948,7 +8038,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f653-9aa6-01ce-6dcd" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="b90a-ae7b-376e-148f" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="b90a-ae7b-376e-148f" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
@@ -7958,13 +8048,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="6fa7-d4c0-05d6-f3e1" name="Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="d388-aa0e-5837-5fc6">
+            <selectionEntryGroup id="6fa7-d4c0-05d6-f3e1" name="Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="d388-aa0e-5837-5fc6" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c625-d2da-40cf-1c60" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4632-72b4-a723-9263" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="f404-7362-f607-3022" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="f404-7362-f607-3022" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7975,7 +8065,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d388-aa0e-5837-5fc6" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="d388-aa0e-5837-5fc6" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7983,7 +8073,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bfeb-aae6-df5e-5322" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="f531-7238-f89e-7cd4" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="f531-7238-f89e-7cd4" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
@@ -7995,13 +8085,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
-        <selectionEntryGroup id="5bf8-8e56-e8a1-eb3c" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="5bf8-8e56-e8a1-eb3c" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="829b-3441-4a2a-bc9d" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8c62-c567-4510-88ff" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="bed0-2c94-bd85-1840" name="Generator" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="bed0-2c94-bd85-1840" name="Generator" hidden="false" collective="false" import="true" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0d31-d525-2f56-dca8" type="max"/>
               </constraints>
@@ -8029,24 +8119,28 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="7473-bac5-1a8c-021d" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                <entryLink id="95c0-80ce-310b-8684" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="95c0-80ce-310b-8684" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
+                <entryLink id="d54b-d968-1fb2-5438" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="d54b-d968-1fb2-5438" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
+                <entryLink import="true" name="Portal generator" hidden="false" id="9eaa-549d-46a5-05aa" collective="false" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" value="Portal generator (1)" field="name"/>
+                    <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+                  </modifiers>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5"/>
                   </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="ffb6-aeb5-24d7-8c88" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="1452-9d34-f84e-6a95">
+            <selectionEntryGroup id="ffb6-aeb5-24d7-8c88" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="1452-9d34-f84e-6a95" sortIndex="1">
               <modifiers>
                 <modifier type="set" field="1b2b-f1d9-d73f-3e9c" value="0">
                   <conditions>
@@ -8059,7 +8153,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c946-4e14-1ea7-58e9" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="1452-9d34-f84e-6a95" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="1452-9d34-f84e-6a95" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8067,7 +8161,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9ae6-177d-d3b0-9762" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink import="true" name="Heavy Rocket Battery" hidden="false" id="d764-5d5-de91-50b0" collective="false" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink import="true" name="Heavy Rocket Battery" hidden="false" id="d764-5d5-de91-50b0" collective="false" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
                   </modifiers>
@@ -8075,7 +8169,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="533b-6228-a196-946e" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
                   </constraints>
                 </entryLink>
-                <entryLink import="true" name="D-Cannon [3.06]" hidden="false" id="6140-df6e-9ac1-2226" collective="false" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink import="true" name="D-Cannon Battery" hidden="false" id="6140-df6e-9ac1-2226" collective="false" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
                   </modifiers>
@@ -8086,7 +8180,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" hidden="false" id="1601-6579-e6eb-4d0c" typeId="7c9b-6b09-b5ac-2249" value="4"/>
                   </costs>
                 </entryLink>
-                <entryLink import="true" name="Particle Beamer" hidden="false" id="dd4c-7890-a479-7826" collective="false" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink import="true" name="Particle Beamer" hidden="false" id="dd4c-7890-a479-7826" collective="false" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
                   </modifiers>
@@ -8103,7 +8197,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="f56c-beaf-5b10-7273" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="f56c-beaf-5b10-7273" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
@@ -8124,7 +8218,6 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="1d52-c1c0-0996-179b" name="Giant Slayer [3.07a]" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
         <infoLink id="f4b7-588f-8865-fd9c" name="Linear Dash [3.07a]" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
         <infoLink id="5d88-c52c-d5e2-74ed" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="eb42-783d-5026-9aab" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
         <infoLink id="cc94-706b-a47f-73fe" name="Corvette Duty [3.07a]" hidden="false" targetId="4836-a907-b316-55b2" type="rule"/>
         <infoLink id="5af4-e92f-57a8-fe1b" name="Alsaqr" hidden="false" targetId="2955-837e-d457-8fd0" type="profile"/>
       </infoLinks>
@@ -8133,12 +8226,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="a02d-551e-62ae-75b0" name="Skybarque" hidden="false" targetId="384e-0f54-650c-7744" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="a2a1-681a-de6b-4ded" name="Aerial Barbette Launcher" hidden="false" collective="false" import="true" targetId="c9dc-60f8-dc45-25fd" type="selectionEntry">
+        <entryLink id="a2a1-681a-de6b-4ded" name="Aerial Barbette Launcher" hidden="false" collective="false" import="true" targetId="c9dc-60f8-dc45-25fd" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="d852-7418-e549-e4a3" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="d852-7418-e549-e4a3" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -8160,22 +8253,8 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="87ff-0732-befd-f3e6" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="391f-3f34-5927-a12d" name="Maritime Patrol [3.07a]" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
         <infoLink id="f253-77cb-62fd-75b2" name="Vanguard [3.07a]" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
-        <infoLink id="42d8-9372-cd4c-4bcc" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
         <infoLink id="9a22-b5b2-0752-eaf5" name="Awsbiri" hidden="false" targetId="515f-4ea8-7919-b3f7" type="profile"/>
-        <infoLink id="a1d6-2fdb-adf4-459b" name="Elite Crew [3.07a]" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="notInstanceOf"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
-        </infoLink>
-        <infoLink id="0571-3f9d-ed67-e910" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
+        <infoLink id="0571-3f9d-ed67-e910" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditionGroups>
@@ -8195,7 +8274,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="c579-de01-13b9-43ac" name="Skylancer" hidden="false" targetId="aecf-19b6-4b52-16de" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="8937-dda8-4316-61c9" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="8937-dda8-4316-61c9" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="4">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="108b-ef97-ec19-530a" type="min"/>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="142d-c335-6ca5-bfe4" type="max"/>
@@ -8207,7 +8286,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7ee8-01b5-4d24-c6bb" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="cfa1-176e-5d3a-e512" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="cfa1-176e-5d3a-e512" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -8218,7 +8297,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="a049-4be9-5375-45d2" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="a049-4be9-5375-45d2" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -8226,7 +8305,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ceb6-83a4-d1f9-5b0c" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="412e-e9f0-0a71-b9f1" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="412e-e9f0-0a71-b9f1" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -8242,7 +8321,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9286-01b2-c967-694b" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="805e-945b-b768-b9a0" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="805e-945b-b768-b9a0" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -8253,7 +8332,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="6843-869f-0acf-35cd" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="6843-869f-0acf-35cd" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -8261,7 +8340,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4c4f-ceb4-e733-9a14" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="a41a-445f-8cc1-8be8" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="a41a-445f-8cc1-8be8" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -8277,7 +8356,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1e9b-699c-b261-480a" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7fe8-4323-691a-fe1a" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="7fe8-4323-691a-fe1a" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8288,7 +8367,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="09b1-b884-70d9-f670" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="09b1-b884-70d9-f670" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8296,7 +8375,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1de3-62c0-fc29-cfeb" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="8616-7a22-f474-e52b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="8616-7a22-f474-e52b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8310,20 +8389,20 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="1133-3581-2339-bafd" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="1133-3581-2339-bafd" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="ed4b-2895-54de-7858" name="Aerial Torpedo Salvo" hidden="false" collective="false" import="true" targetId="09d0-01c4-9075-9480" type="selectionEntry">
+        <entryLink id="ed4b-2895-54de-7858" name="Aerial Torpedo Salvo" hidden="false" collective="false" import="true" targetId="09d0-01c4-9075-9480" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="7a2e-92a8-1d2f-6eda" name="Sabiha SRS" hidden="false" collective="false" import="true" targetId="8b86-c3f0-5464-c54d" type="selectionEntry"/>
+        <entryLink id="7a2e-92a8-1d2f-6eda" name="Sabiha SRS" hidden="false" collective="false" import="true" targetId="8b86-c3f0-5464-c54d" type="selectionEntry" sortIndex="1"/>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="110"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="105"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
@@ -8334,38 +8413,42 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </constraints>
       <infoLinks>
         <infoLink id="aad4-624f-8763-8e15" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="c626-59d5-b77a-d9f1" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="bdb4-63ac-8310-9119" name="Celerity [3.06]" hidden="false" targetId="e0a4-52b6-676c-9b6d" type="rule"/>
+        <infoLink id="bdb4-63ac-8310-9119" name="Celerity [3.07]" hidden="false" targetId="e0a4-52b6-676c-9b6d" type="rule"/>
         <infoLink id="5972-61ab-0c1d-6a5c" name="Strategic Withdrawal [3.07a]" hidden="false" targetId="950e-974b-d566-0e66" type="rule"/>
         <infoLink id="d77a-dc38-0e18-53f5" name="Colossus [3.07a]" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
         <infoLink id="2cb8-7ab4-f690-852e" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="8ca6-9629-1d96-9b3d" name="Unexpected Arrival [3.07a]" hidden="false" targetId="f4aa-042e-34e5-1938" type="rule"/>
-        <infoLink id="9a45-ad8e-27b5-3a3a" name="Vigour [3.06]" hidden="false" targetId="91f7-3138-f1c6-4770" type="rule"/>
+        <infoLink id="9a45-ad8e-27b5-3a3a" name="Vigour [3.07]" hidden="false" targetId="91f7-3138-f1c6-4770" type="rule"/>
         <infoLink id="b1b0-fc20-4ff0-82f1" name="Chaska" hidden="false" targetId="27ce-8bc7-7c97-9a8d" type="profile"/>
         <infoLink name="Cor Carolus Icon [3.06]" hidden="false" id="197d-693f-5756-3c81" targetId="5cc3-215b-4d38-3609" type="rule"/>
-        <infoLink name="Limited Generation [3.06]" hidden="false" id="4700-d6cf-7c1-a8af" targetId="f581-17a1-44d1-abcf" type="rule"/>
+        <infoLink name="Limited Generation [3.07]" hidden="false" id="4700-d6cf-7c1-a8af" targetId="f581-17a1-44d1-abcf" type="rule"/>
+        <infoLink id="ffb8-44d8-035b-18a3" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9b70-3e54-2f52-7a4a" name="Vitruvian Colossus" hidden="false" targetId="8ecc-741e-13ac-3fd8" primary="false"/>
         <categoryLink id="7304-9348-b11f-8777" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="a042-e171-e7b0-4518" name="Chaska Starblade" hidden="false" collective="false" import="true" targetId="e247-ef54-bcc7-9e96" type="selectionEntry">
+        <entryLink id="a042-e171-e7b0-4518" name="Chaska Starblade" hidden="false" collective="false" import="true" targetId="e247-ef54-bcc7-9e96" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="7cb4-82be-9687-8ce3" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry">
+        <entryLink id="7cb4-82be-9687-8ce3" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
         </entryLink>
-        <entryLink import="true" name="Mirage generator" hidden="false" id="a4c2-f340-5446-78a0" collective="false" targetId="163e-8002-bc82-d20f" type="selectionEntry">
+        <entryLink import="true" name="Mirage generator" hidden="false" id="a4c2-f340-5446-78a0" collective="false" targetId="163e-8002-bc82-d20f" type="selectionEntry" sortIndex="1">
           <costs>
             <cost name="Points" hidden="false" id="7a70-2f58-b115-e9b8" typeId="7c9b-6b09-b5ac-2249" value="0"/>
           </costs>
         </entryLink>
-        <entryLink import="true" name="Portal generator" hidden="false" id="30b5-2eff-6a6-9c2d" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
+        <entryLink import="true" name="Portal generator" hidden="false" id="30b5-2eff-6a6-9c2d" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="2">
+          <modifiers>
+            <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="165"/>
@@ -8384,36 +8467,35 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="7acf-e329-99bc-56ae" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="f5d3-027d-884d-0d0c" name="Hydrophone Relay [3.07a]" hidden="false" targetId="1b80-20ba-6dae-7094" type="rule"/>
         <infoLink id="ca9c-4f9d-cdca-7fc2" name="Hırka" hidden="false" targetId="db9a-437a-dc9c-6593" type="profile"/>
-        <infoLink id="196c-fdc6-ce8c-0ca3" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="4f60-90e1-348d-9b5a" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="e01b-73f6-00e9-4846" name="Skycutter" hidden="false" targetId="83a0-8941-e971-1ac1" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="6edc-5f4b-9e46-3594" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry">
+        <entryLink id="6edc-5f4b-9e46-3594" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1356-319f-a548-012e" name="Aerial Torpedo Salvo" hidden="false" collective="false" import="true" targetId="09d0-01c4-9075-9480" type="selectionEntry">
+        <entryLink id="1356-319f-a548-012e" name="Aerial Torpedo Salvo" hidden="false" collective="false" import="true" targetId="09d0-01c4-9075-9480" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="52"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="50"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
       <selectionEntryGroups>
-        <selectionEntryGroup name="Main Weapon" hidden="false" id="9c3b-f443-8c7d-bc79" collective="false" import="true" defaultSelectionEntryId="491-6c95-3ae6-579d">
+        <selectionEntryGroup name="Main Weapon" hidden="false" id="9c3b-f443-8c7d-bc79" collective="false" import="true" defaultSelectionEntryId="491-6c95-3ae6-579d" sortIndex="3">
           <constraints>
             <constraint type="min" value="1" field="selections" scope="parent" shared="false" id="47de-9fcc-3717-6ae" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
             <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="496-e914-6ac-3288" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
           </constraints>
           <entryLinks>
-            <entryLink import="true" name="Advanced Aetheric Lance" hidden="false" id="9c6-ac86-f170-8efd" collective="false" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+            <entryLink import="true" name="Aetheric Lance" hidden="false" id="9c6-ac86-f170-8efd" collective="false" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
               <modifiers>
                 <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
               </modifiers>
@@ -8424,7 +8506,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
               </costs>
             </entryLink>
-            <entryLink import="true" name="Gun Battery" hidden="false" id="491-6c95-3ae6-579d" collective="false" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+            <entryLink import="true" name="Gun Battery" hidden="false" id="491-6c95-3ae6-579d" collective="false" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
               <modifiers>
                 <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
               </modifiers>
@@ -8432,7 +8514,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="a163-3257-6ffd-17f6" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </constraints>
             </entryLink>
-            <entryLink import="true" name="Rocket Battery" hidden="false" id="c765-fad9-5de2-450" collective="false" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+            <entryLink import="true" name="Rocket Battery" hidden="false" id="c765-fad9-5de2-450" collective="false" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
               <modifiers>
                 <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
               </modifiers>
@@ -8456,10 +8538,14 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="f688-89c3-160b-6b6d" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="9b87-7656-3eac-0127" name="Linear Dash [3.07a]" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
         <infoLink id="2e94-d923-aec4-b5c6" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="0960-67c2-a282-45c6" name="Skyfire [3.07a]" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
+        <infoLink id="0960-67c2-a282-45c6" name="Tracer Fire (x) [3.06a]" hidden="false" targetId="6266-3217-d898-9935" type="rule">
+          <modifiers>
+            <modifier type="set" value="Tracer Fire (Aerial)" field="name"/>
+          </modifiers>
+        </infoLink>
         <infoLink id="9c7c-ce68-02ed-d3ca" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
         <infoLink id="fe10-5763-145f-abb4" name="Nasr" hidden="false" targetId="9cc1-8cb2-dece-7561" type="profile"/>
-        <infoLink id="aecd-6582-f8a7-7fa3" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
+        <infoLink id="aecd-6582-f8a7-7fa3" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditionGroups>
@@ -8472,14 +8558,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </modifier>
           </modifiers>
         </infoLink>
-        <infoLink name="Vulnerable Stern [3.07a]" hidden="false" id="44d3-9e83-c929-ca35" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9059-da4a-83e9-fdbc" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="73cc-e7cc-5b64-9430" name="Skyship" hidden="false" targetId="6ca6-8e50-1c57-18cc" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="52cd-8fe8-f8d0-7185" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="52cd-8fe8-f8d0-7185" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e687-feee-79d4-d4db" type="min"/>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5146-2644-3636-9cce" type="max"/>
@@ -8491,7 +8576,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d78c-2163-23b5-56eb" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="b3d6-fd16-3611-e2c1" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="b3d6-fd16-3611-e2c1" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8499,7 +8584,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cb9c-8047-79b6-7d08" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="eb45-f481-51a7-401a" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="eb45-f481-51a7-401a" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8510,7 +8595,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="4"/>
                   </costs>
                 </entryLink>
-                <entryLink id="6a32-4239-a2a1-2323" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="6a32-4239-a2a1-2323" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8521,7 +8606,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="4"/>
                   </costs>
                 </entryLink>
-                <entryLink id="918a-6388-c6ba-9f07" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="918a-6388-c6ba-9f07" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8540,7 +8625,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="00a7-3409-cb4e-e403" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="b712-9008-a9ee-61bf" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="b712-9008-a9ee-61bf" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -8551,7 +8636,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="0931-dc55-11bb-ee63" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="0931-dc55-11bb-ee63" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -8562,7 +8647,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3"/>
                   </costs>
                 </entryLink>
-                <entryLink id="310b-af45-cab8-053f" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="310b-af45-cab8-053f" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -8578,7 +8663,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e0dd-d947-d59b-b9fd" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="6aa6-1ddc-b761-f0a9" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="6aa6-1ddc-b761-f0a9" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -8589,7 +8674,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="46c2-27df-7646-4cd3" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="46c2-27df-7646-4cd3" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -8600,7 +8685,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3"/>
                   </costs>
                 </entryLink>
-                <entryLink id="3913-6f3b-1f50-2d82" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="3913-6f3b-1f50-2d82" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -8614,7 +8699,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="c604-fcb5-d183-6074" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="c604-fcb5-d183-6074" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
@@ -8623,10 +8708,10 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ba51-c55f-5d87-b603" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="c544-d3c7-0917-94b8" name="Sabiha SRS" hidden="false" collective="false" import="true" targetId="8b86-c3f0-5464-c54d" type="selectionEntry"/>
+        <entryLink id="c544-d3c7-0917-94b8" name="Sabiha SRS" hidden="false" collective="false" import="true" targetId="8b86-c3f0-5464-c54d" type="selectionEntry" sortIndex="1"/>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="106"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="100"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
@@ -8767,7 +8852,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="5218-6da1-00cb-9975" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="5218-6da1-00cb-9975" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8820,7 +8905,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="befa-cdbe-54ad-6b8b" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="befa-cdbe-54ad-6b8b" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -8871,34 +8956,37 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="27ed-388d-0447-29ef" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="9c7b-e80a-d7d8-f2aa" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
         <infoLink id="74f0-d0aa-d5c2-2fd9" name="Cor Caroli [3.06]" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
-        <infoLink id="c060-1484-9411-df85" name="Elite Crew [3.07a]" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
         <infoLink id="955e-d121-0d62-da48" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="c726-0a06-e2fe-d57e" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="714b-51f6-0147-c8f9" name="Portal Focus [3.06]" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="ab6e-e400-d987-eada" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="05ae-c36f-558f-08ce" name="Exemplar-Cruiser" hidden="false" targetId="b273-5d34-7ed4-05c1" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="db60-2118-9d5b-2647" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="db60-2118-9d5b-2647" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="c22c-4786-d1e7-c3eb" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
+        <entryLink id="c22c-4786-d1e7-c3eb" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="161b-1512-8569-929e" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry">
+        <entryLink id="161b-1512-8569-929e" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
+        <entryLink import="true" name="Portal generator" hidden="false" id="9eb9-ddcb-8aab-1ebc" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="1">
+          <modifiers>
+            <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="135"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="155"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
@@ -8921,8 +9009,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="2ade-9492-e10e-16f7" name="Maritime Patrol [3.07a]" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
         <infoLink id="9d9f-f4e1-4751-4bec" name="Gun Runner [3.06]" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
         <infoLink id="63c0-d41f-0904-fb4d" name="Heavy Firepower [3.07a]" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="f8f5-aef4-3651-2741" name="Focused Gunnery [3.06]" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
-        <infoLink id="c10f-9340-463f-5a87" name="Portal Focus [3.06]" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
+        <infoLink id="f8f5-aef4-3651-2741" name="Focused Fire (x) [3.07a]" hidden="false" targetId="6c94-ad2b-60d8-2c4f" type="rule">
+          <modifiers>
+            <modifier type="set" value="Focused Fire (Gunnery)" field="name"/>
+          </modifiers>
+        </infoLink>
+        <infoLink id="c10f-9340-463f-5a87" name="Master Portal Generator [3.07]" hidden="false" targetId="db90-0b63-d0f9-5222" type="rule"/>
         <infoLink id="28da-99c0-c5e1-c688" name="Disciplined [3.07a]" hidden="false" targetId="ecf0-d255-3339-4a1b" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -8931,17 +9023,17 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="4f63-9aff-4dd7-ad39" name="Unique" hidden="false" targetId="293e-b55a-bcfa-95c3" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="e2e1-e7fe-c6fc-4317" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="e2e1-e7fe-c6fc-4317" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="43d3-3bf2-eb83-1594" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
+        <entryLink id="43d3-3bf2-eb83-1594" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1b2b-4d33-a229-7873" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
+        <entryLink id="1b2b-4d33-a229-7873" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
@@ -8950,17 +9042,21 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c2a1-ba8c-93e6-f08b" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="c56b-abad-2ee1-c47b" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
+        <entryLink id="c56b-abad-2ee1-c47b" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
         </entryLink>
-        <entryLink id="e318-a729-1ba5-f784" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
+        <entryLink id="e318-a729-1ba5-f784" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
         </entryLink>
-        <entryLink id="fcfd-c239-c53e-7691" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
+        <entryLink import="true" name="Portal generator" hidden="false" id="4680-ea08-1d4e-bc4b" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="1">
+          <modifiers>
+            <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="255"/>
@@ -8985,7 +9081,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="8a15-03c2-2541-409d" name="Maritime Patrol [3.07a]" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
         <infoLink id="d3f9-c822-1f94-e89b" name="Gun Runner [3.06]" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
         <infoLink id="5e54-595d-5aa4-6a9e" name="Heavy Firepower [3.07a]" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="e1a8-2b02-ff18-9e29" name="Focused Gunnery [3.06]" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="e1a8-2b02-ff18-9e29" name="Focused Fire (x) [3.07a]" hidden="false" targetId="6c94-ad2b-60d8-2c4f" type="rule">
+          <modifiers>
+            <modifier type="set" value="Focused Fire (Gunnery)" field="name"/>
+          </modifiers>
+        </infoLink>
         <infoLink id="f1c7-7fe1-7b90-3a79" name="Sharpshooter [3.07a]" hidden="false" targetId="2c93-befd-f88b-0881" type="rule"/>
         <infoLink id="4d2f-1513-0738-fd8f" name="Fortunes of War [3.07a]" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
       </infoLinks>
@@ -8995,35 +9095,41 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="9931-61f1-fb7b-6b44" name="Unique" hidden="false" targetId="293e-b55a-bcfa-95c3" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="0045-67d8-a7da-8e60" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="0045-67d8-a7da-8e60" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="b46f-7d87-323b-c9e6" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
+        <entryLink id="b46f-7d87-323b-c9e6" name="Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="73d5-d8e9-976e-de51" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
+        <entryLink id="73d5-d8e9-976e-de51" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Front Second" hidden="false" id="9faf-b587-6b65-5858" targetId="c595-958b-800e-2c04" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="d7d4-e8a4-79d7-289e" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
+        <entryLink id="d7d4-e8a4-79d7-289e" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
         </entryLink>
-        <entryLink id="d885-3b0b-2e70-7349" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
+        <entryLink id="d885-3b0b-2e70-7349" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1bb9-b340-f947-ec28" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
+        <entryLink id="1bb9-b340-f947-ec28" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Front First" hidden="false" id="3158-19a7-dcc4-4661" targetId="62c7-5eb0-d38e-486" primary="false"/>
+          </categoryLinks>
         </entryLink>
       </entryLinks>
       <costs>
@@ -9047,14 +9153,14 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="2c4f-4b73-eb6a-c0cc" name="Large Target [3.07a]" hidden="false" targetId="5b16-04f1-a7a8-d2e0" type="rule"/>
         <infoLink id="1150-650a-c3bd-9259" name="Priority Signals [3.07a]" hidden="false" targetId="4106-315d-4d5c-9e8f" type="rule"/>
         <infoLink id="db56-5094-d9d0-e1dd" name="Tanis" hidden="false" targetId="18bc-c83d-7047-92b0" type="profile"/>
-        <infoLink id="60b7-69c6-d093-3435" name="Khepri Portal Strike [3.06]" hidden="false" targetId="ef6d-9cb4-5273-88bb" type="rule"/>
+        <infoLink id="60b7-69c6-d093-3435" name="Khepri Portal Strike [3.07]" hidden="false" targetId="ef6d-9cb4-5273-88bb" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5af3-47e1-e0da-0a5c" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="a0eb-d496-9e62-db36" name="Control Cruiser" hidden="false" targetId="a9a1-5c58-9d30-452a" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="9fa2-aac8-9d84-91fd" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="9fa2-aac8-9d84-91fd" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="542a-a645-5328-6174" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f284-1441-3baa-2843" type="max"/>
@@ -9067,7 +9173,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
               </modifiers>
             </infoLink>
             <infoLink id="af0a-33a9-aeff-e436" name="Khepri SRS Tokens [3.06]" hidden="false" targetId="a0d9-f4d0-a016-2331" type="rule"/>
-            <infoLink id="7b3d-2cb8-a3af-039f" name="Khepri SRS Capacity [3.06]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
+            <infoLink id="7b3d-2cb8-a3af-039f" name="Khepri SRS Capacity [3.07]" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
@@ -9076,19 +9182,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
-        <selectionEntryGroup id="8e53-4562-2a3f-3e3b" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="8e53-4562-2a3f-3e3b" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="5">
           <constraints>
             <constraint field="selections" scope="parent" value="6" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="512c-e750-fd34-45a5" type="min"/>
             <constraint field="selections" scope="parent" value="6" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="168a-0787-a27f-56ca" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="53d3-0fa6-0be8-84aa" name="First Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="4bf6-4bca-597b-a9cc">
+            <selectionEntryGroup id="53d3-0fa6-0be8-84aa" name="First Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="4bf6-4bca-597b-a9cc" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8ff4-a253-dc05-8d96" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3c2b-4bc2-bfb8-4f88" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="4a7b-bde3-9c1e-78ba" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="4a7b-bde3-9c1e-78ba" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9099,31 +9205,40 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="4bf6-4bca-597b-a9cc" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="4bf6-4bca-597b-a9cc" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="19c4-dbb4-adab-22fe" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
+                  </costs>
                 </entryLink>
-                <entryLink id="8dc2-3da8-52c2-18bd" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="8dc2-3da8-52c2-18bd" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8dd3-d083-94e3-f73a" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port First" hidden="false" id="167b-c409-88ed-1895" targetId="55de-fe5d-650a-2f4a" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="596c-6f5a-e363-a596" name="First Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="97af-7c67-da6e-6666">
+            <selectionEntryGroup id="596c-6f5a-e363-a596" name="First Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="97af-7c67-da6e-6666" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb37-0000-1e20-9e55" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9cfb-096c-4039-b5d5" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="9dfa-e216-b345-f0d6" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="9dfa-e216-b345-f0d6" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9134,7 +9249,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="97af-7c67-da6e-6666" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="97af-7c67-da6e-6666" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9149,16 +9264,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c8eb-161c-d392-53ab" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="68a5-36d0-e8f7-42ce" name="Second Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="a309-5c01-0059-bec8">
+            <selectionEntryGroup id="68a5-36d0-e8f7-42ce" name="Second Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="a309-5c01-0059-bec8" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bacd-9fc7-256a-2f59" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="33d3-697b-37df-f15d" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="8830-2495-1f6f-80b3" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="8830-2495-1f6f-80b3" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9169,7 +9287,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="a309-5c01-0059-bec8" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="a309-5c01-0059-bec8" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9184,16 +9302,22 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="12ae-91a3-a3b1-fc46" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port Second" hidden="false" id="3df3-f60e-7b89-40b5" targetId="e1e9-a88-1bb-b8aa" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="89f6-540a-e1ab-30cd" name="Third Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="66b5-77f6-bfe2-d1d9">
+            <selectionEntryGroup id="89f6-540a-e1ab-30cd" name="Third Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="66b5-77f6-bfe2-d1d9" sortIndex="5">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ae10-a9a0-5d2e-ef79" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="250b-714b-306e-220e" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="5ad6-715a-ef6e-af5e" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="5ad6-715a-ef6e-af5e" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9204,7 +9328,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="66b5-77f6-bfe2-d1d9" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="66b5-77f6-bfe2-d1d9" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9212,23 +9336,29 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="84f7-8d3b-e9b7-b670" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="cf13-ebf1-d784-154a" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="cf13-ebf1-d784-154a" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6af8-d6f4-b579-f02a" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Port Third" hidden="false" id="1db6-6c7c-1065-2476" targetId="0c23-0110-ee82-8551" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="72ad-b346-953f-b068" name="Second Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="aa5d-0aa6-fc56-19df">
+            <selectionEntryGroup id="72ad-b346-953f-b068" name="Second Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="aa5d-0aa6-fc56-19df" sortIndex="4">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ffb-f9a7-7bf7-1a43" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3748-7248-b6fa-2ef1" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="11bb-3b04-69f2-4ecf" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="11bb-3b04-69f2-4ecf" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9239,7 +9369,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="aa5d-0aa6-fc56-19df" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="aa5d-0aa6-fc56-19df" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9247,23 +9377,26 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="499f-ca60-5215-f31c" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="e802-b49b-cd1f-8337" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="e802-b49b-cd1f-8337" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1951-7106-cff9-72ce" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="85db-648e-a810-91d8" name="Third Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="1729-bbc1-f9cb-dbdc">
+            <selectionEntryGroup id="85db-648e-a810-91d8" name="Third Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="1729-bbc1-f9cb-dbdc" sortIndex="6">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5d8a-c087-0930-3a1d" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9342-a872-c664-5726" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7dd6-57df-81a0-532e" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="7dd6-57df-81a0-532e" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9274,7 +9407,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="1729-bbc1-f9cb-dbdc" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="1729-bbc1-f9cb-dbdc" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9282,31 +9415,42 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d6b9-e845-0e86-2903" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="5490-8492-1296-206b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="5490-8492-1296-206b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="47c1-ff76-6274-0b99" type="max"/>
                   </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
+              <categoryLinks>
+                <categoryLink name="Starboard Third" hidden="false" id="6b44-8e7c-ef9a-16b0" targetId="cbe3-a4d6-4d7d-9a4c" primary="false"/>
+              </categoryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="19bb-af37-ef82-9e43" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
-        <entryLink id="82d1-df39-dc86-f48b" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="82d1-df39-dc86-f48b" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink import="true" name="Torpedo Salvo" hidden="false" id="58e5-5996-1c64-7085" collective="false" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink import="true" name="Torpedo Salvo" hidden="false" id="58e5-5996-1c64-7085" collective="false" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" value="dbb4-72d5-bceb-70b3" field="category"/>
           </modifiers>
         </entryLink>
+        <entryLink import="true" name="Portal generator" hidden="false" id="9016-149e-5f8a-897f" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="2">
+          <modifiers>
+            <modifier type="set" value="Portal generator (2)" field="name"/>
+            <modifier type="add" value="8901-cc02-f55e-2ee5" field="category"/>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="345"/>
@@ -9330,19 +9474,19 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="a77c-797d-7f90-b7c7" name="Control Cruiser" hidden="false" targetId="a9a1-5c58-9d30-452a" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="ebee-2453-851d-3337" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="ebee-2453-851d-3337" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="10">
           <constraints>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="12a9-c1c4-faf1-7872" type="min"/>
             <constraint field="selections" scope="parent" value="3" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="71bd-11d4-143f-51bb" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="d856-811d-7b41-56a9" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="61f7-4518-7b01-03be">
+            <selectionEntryGroup id="d856-811d-7b41-56a9" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="61f7-4518-7b01-03be" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6249-78c7-afa4-3baa" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0337-76ae-96ff-7177" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="b8c3-78c8-3eea-b76f" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="b8c3-78c8-3eea-b76f" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9350,7 +9494,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d064-cd16-3110-2532" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="61f7-4518-7b01-03be" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="61f7-4518-7b01-03be" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9358,7 +9502,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="00d6-1dd0-d739-0e3d" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="abcc-f2c5-ea9c-e116" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="abcc-f2c5-ea9c-e116" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9369,7 +9513,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15"/>
                   </costs>
                 </entryLink>
-                <entryLink id="cec9-6223-a7f1-cc2c" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="cec9-6223-a7f1-cc2c" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9379,13 +9523,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="4ab3-66f1-df5d-c952" name="Starbord" hidden="false" collective="false" import="true" defaultSelectionEntryId="7e91-6040-9db3-d399">
+            <selectionEntryGroup id="4ab3-66f1-df5d-c952" name="Starbord" hidden="false" collective="false" import="true" defaultSelectionEntryId="7e91-6040-9db3-d399" sortIndex="3">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f592-53a6-d625-585a" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ca06-5f72-a6e0-e92b" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7a85-7197-5f7d-7e7c" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="7a85-7197-5f7d-7e7c" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9393,7 +9537,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ed45-06cf-e75a-16ea" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="7e91-6040-9db3-d399" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="7e91-6040-9db3-d399" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9401,7 +9545,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="84ea-0f00-05a0-316f" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="ddd1-f913-1fa1-1fca" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="ddd1-f913-1fa1-1fca" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9412,7 +9556,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15"/>
                   </costs>
                 </entryLink>
-                <entryLink id="89b3-9e57-6021-a591" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="89b3-9e57-6021-a591" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9422,13 +9566,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="856a-8068-dbbc-a902" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="3022-2692-4c7c-7236">
+            <selectionEntryGroup id="856a-8068-dbbc-a902" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="3022-2692-4c7c-7236" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="093b-cb8e-5013-3f9d" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="40e5-a59e-c64a-d3b2" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7b22-af38-a561-5b0e" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="7b22-af38-a561-5b0e" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
                   </modifiers>
@@ -9444,7 +9588,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5cd3-85cc-ceed-8d74" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="3022-2692-4c7c-7236" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="3022-2692-4c7c-7236" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
                   </modifiers>
@@ -9458,47 +9602,65 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="2fef-78bb-cd10-69a0" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="2fef-78bb-cd10-69a0" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="1">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
         </entryLink>
-        <entryLink id="9824-cb92-04fe-1ae7" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="9824-cb92-04fe-1ae7" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Port First" hidden="false" id="e3e2-7ac3-d95d-088c" targetId="55de-fe5d-650a-2f4a" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="a270-bc8f-49d2-1bba" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="a270-bc8f-49d2-1bba" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Starboard First" hidden="false" id="dfea-79b6-893c-30be" targetId="801-696b-9bb1-e4ef" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="f02e-a05d-5f99-0c5d" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="f02e-a05d-5f99-0c5d" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Port Second" hidden="false" id="f92c-82fa-8087-a797" targetId="e1e9-a88-1bb-b8aa" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="9c5d-bd67-2cf7-354a" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="9c5d-bd67-2cf7-354a" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="7">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Starboard Second" hidden="false" id="adc2-61b7-d586-ecd7" targetId="a036-e1b6-ee86-ebf7" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="d5e6-b286-4cae-f3e4" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="d5e6-b286-4cae-f3e4" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="8">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Port Third" hidden="false" id="0a5e-ea40-f0af-7ce9" targetId="0c23-0110-ee82-8551" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="6c8f-8913-b8cc-7100" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry">
+        <entryLink id="6c8f-8913-b8cc-7100" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="2492-854e-2179-e50b" type="selectionEntry" sortIndex="9">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Starboard Third" hidden="false" id="fc91-3074-2b30-cb61" targetId="cbe3-a4d6-4d7d-9a4c" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="272c-443b-95eb-6be0" name="Heavy Particle Cannon" hidden="false" collective="false" import="true" targetId="fa1b-fa45-a389-af24" type="selectionEntry">
+        <entryLink id="272c-443b-95eb-6be0" name="Horus Heavy Particle Cannon" hidden="false" collective="false" import="true" targetId="137c-86a6-036d-f89e" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink import="true" name="Torpedo Salvo" hidden="false" id="d2bf-d2d-1382-ec72" collective="false" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+        <entryLink import="true" name="Torpedo Salvo" hidden="false" id="d2bf-d2d-1382-ec72" collective="false" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" value="dbb4-72d5-bceb-70b3" field="category"/>
           </modifiers>
@@ -9518,27 +9680,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="c535-e9e3-810f-0059" name="Lyceum" hidden="false" targetId="6de4-5b43-0788-b170" type="profile"/>
         <infoLink id="0d7e-d606-ef6e-dc0c" name="Flak Barrage (x) [3.07a]" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
-            <modifier type="append" field="name" value="(6)"/>
+            <modifier type="set" field="name" value="Flak Barrage (6)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="f404-4444-61fc-8257" name="Focused Gunnery [3.06]" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
         <infoLink id="885e-0471-ee32-e714" name="Heavy Firepower [3.07a]" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="f6cb-ed34-b951-d366" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
         <infoLink id="a543-460a-d61c-cb7f" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="dd5d-b8f5-40e2-b932" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="force" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="notInstanceOf"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
-        </infoLink>
-        <infoLink id="5663-1847-7e96-06df" name="Elite Crew [3.07a]" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule">
+        <infoLink id="dd5d-b8f5-40e2-b932" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditionGroups>
@@ -9564,25 +9712,30 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </modifier>
           </modifiers>
         </infoLink>
+        <infoLink name="Focused Fire (x) [3.07a]" id="6863-8f50-6312-cb5c" hidden="false" targetId="6c94-ad2b-60d8-2c4f" type="rule">
+          <modifiers>
+            <modifier type="set" value="Focused Fire (Gunnery)" field="name"/>
+          </modifiers>
+        </infoLink>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="d2c0-b463-b36b-dd1f" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="fe16-0370-4024-9b6a" name="Aerial Dreadnought" hidden="false" targetId="ec7b-1e05-b0b8-edb8" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="48ee-f77f-5b56-61a2" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="48ee-f77f-5b56-61a2" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" sortIndex="10">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="99df-70c7-f2e0-4142" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fcc0-49a7-2336-344b" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="edb6-44fb-6462-df7c" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="b1fc-7201-90c3-6123">
+            <selectionEntryGroup id="edb6-44fb-6462-df7c" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="b1fc-7201-90c3-6123" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="66b9-aaef-fa98-4503" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2c23-15dd-e571-2a2c" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="b1fc-7201-90c3-6123" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="b1fc-7201-90c3-6123" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9590,7 +9743,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bd92-c58d-5ca5-c4f8" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="1a53-8dfd-0067-9cdb" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="1a53-8dfd-0067-9cdb" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9598,7 +9751,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7d85-4297-cc2b-5abe" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="9540-0fa1-82bd-0595" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="9540-0fa1-82bd-0595" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9609,7 +9762,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="4"/>
                   </costs>
                 </entryLink>
-                <entryLink id="fff2-7c0f-f47d-5dca" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="fff2-7c0f-f47d-5dca" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -9622,13 +9775,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="f655-de6e-97b9-f69f" name="Starbord" hidden="false" collective="false" import="true" defaultSelectionEntryId="6a6b-b8d8-594f-7ca9">
+            <selectionEntryGroup id="f655-de6e-97b9-f69f" name="Starbord" hidden="false" collective="false" import="true" defaultSelectionEntryId="6a6b-b8d8-594f-7ca9" sortIndex="2">
               <constraints>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="55ee-0db5-b6c2-a4a6" type="min"/>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ba87-ee0e-a577-9cfe" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="6a6b-b8d8-594f-7ca9" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                <entryLink id="6a6b-b8d8-594f-7ca9" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9636,7 +9789,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9ea1-7982-7333-b1f1" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="e8f4-f5de-401a-572a" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
+                <entryLink id="e8f4-f5de-401a-572a" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9644,7 +9797,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e855-f199-8c18-1bda" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="6369-fef8-e820-aa52" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry">
+                <entryLink id="6369-fef8-e820-aa52" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="5dcb-4100-3eab-e801" type="selectionEntry" sortIndex="4">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9655,7 +9808,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7"/>
                   </costs>
                 </entryLink>
-                <entryLink id="7f75-99f9-91eb-b184" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry">
+                <entryLink id="7f75-99f9-91eb-b184" name="D-Cannon Battery" hidden="false" collective="false" import="true" targetId="10f7-c717-2887-f9ca" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -9672,48 +9825,54 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="74c0-9539-775b-d28d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="74c0-9539-775b-d28d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="8">
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
         </entryLink>
-        <entryLink id="9002-b624-30fb-a525" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="9002-b624-30fb-a525" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="7">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
         </entryLink>
-        <entryLink id="5696-a169-5acb-b247" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="5696-a169-5acb-b247" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Front Second" hidden="false" id="e021-3c82-1df6-adda" targetId="c595-958b-800e-2c04" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="f7ab-bb80-9daf-f222" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="f7ab-bb80-9daf-f222" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
         </entryLink>
-        <entryLink id="7d32-ab20-858d-9925" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="7d32-ab20-858d-9925" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Front First" hidden="false" id="f74b-a41a-ea47-61c6" targetId="62c7-5eb0-d38e-486" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="b0ff-06a7-f9f6-c4d4" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="b0ff-06a7-f9f6-c4d4" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="9">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
         </entryLink>
-        <entryLink id="6910-7db0-875e-bede" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="6910-7db0-875e-bede" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="27c7-6494-d18b-0d70"/>
           </modifiers>
         </entryLink>
-        <entryLink id="66fd-342f-adea-0fa0" name="Callimachus Chrono-Lathe" hidden="false" collective="false" import="true" targetId="b0bc-1862-f599-bed6" type="selectionEntry">
+        <entryLink id="66fd-342f-adea-0fa0" name="Callimachus Chrono-Lathe" hidden="false" collective="false" import="true" targetId="b0bc-1862-f599-bed6" type="selectionEntry" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="40e7-b0ca-624e-c20a" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="09e6-9e82-86f1-5569" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="361d-dae7-39fa-4c3f" name="Sabiha SRS" hidden="false" collective="false" import="true" targetId="8b86-c3f0-5464-c54d" type="selectionEntry">
+        <entryLink id="361d-dae7-39fa-4c3f" name="Sabiha SRS" hidden="false" collective="false" import="true" targetId="8b86-c3f0-5464-c54d" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="set" field="7c9b-6b09-b5ac-2249" value="30"/>
           </modifiers>
@@ -9738,17 +9897,20 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </infoLink>
         <infoLink id="1579-085d-e9bf-b70d" name="Flak Barrage (x) [3.07a]" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
-            <modifier type="append" field="name" value="(6)"/>
+            <modifier type="set" field="name" value="Flak Barrage (6)"/>
           </modifiers>
         </infoLink>
         <infoLink id="adf1-b95e-dade-ebe6" name="Crimson Privateers [3.06]" hidden="false" targetId="c7e0-dffa-47c5-ffb2" type="rule"/>
         <infoLink id="ebb9-8a99-6da2-0a50" name="Heavy Firepower [3.07a]" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="4bb3-e662-a334-e4a7" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
         <infoLink id="10fc-93d0-1c72-8eb2" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="1316-503d-43d4-bc07" name="Elite Crew [3.07a]" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="66b9-4d6f-c670-72c8" name="Focused Gunnery [3.06]" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="66b9-4d6f-c670-72c8" name="Focused Fire (x) [3.07a]" hidden="false" targetId="6c94-ad2b-60d8-2c4f" type="rule">
+          <modifiers>
+            <modifier type="set" value="Focused Fire (Gunnery)" field="name"/>
+          </modifiers>
+        </infoLink>
         <infoLink id="feab-e77f-12fb-c114" name="Inspirational [3.07a]" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
-        <infoLink id="27b1-f3b9-a4a8-6534" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="27b1-f3b9-a4a8-6534" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
         <infoLink id="8988-2769-ef82-34a0" name="Devil’s Own Luck [3.07a]" hidden="false" targetId="da8d-c041-fd15-a8de" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -9756,53 +9918,59 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <categoryLink id="dd35-d149-86ed-adc3" name="Aerial Dreadnought" hidden="false" targetId="ec7b-1e05-b0b8-edb8" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="fa11-ac9b-d36d-5262" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="fa11-ac9b-d36d-5262" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="9">
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
         </entryLink>
-        <entryLink id="555c-962f-54c6-231d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="555c-962f-54c6-231d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="8">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
         </entryLink>
-        <entryLink id="722a-84d0-2cda-4d2d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="722a-84d0-2cda-4d2d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="6">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Front Second" hidden="false" id="e8ff-4ecd-e4c7-40a9" targetId="c595-958b-800e-2c04" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="ce57-a901-7475-53dc" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="ce57-a901-7475-53dc" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="7">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
         </entryLink>
-        <entryLink id="a93f-4b14-767d-2ed0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="a93f-4b14-767d-2ed0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="5">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
+          <categoryLinks>
+            <categoryLink name="Front First" hidden="false" id="d749-b175-485e-2d44" targetId="62c7-5eb0-d38e-486" primary="false"/>
+          </categoryLinks>
         </entryLink>
-        <entryLink id="7105-d9fd-183b-c94d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="7105-d9fd-183b-c94d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry" sortIndex="10">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
         </entryLink>
-        <entryLink id="3da8-5696-70a8-97cd" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+        <entryLink id="3da8-5696-70a8-97cd" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="27c7-6494-d18b-0d70"/>
           </modifiers>
         </entryLink>
-        <entryLink id="44c1-a618-4cc3-6370" name="Callimachus Chrono-Lathe" hidden="false" collective="false" import="true" targetId="b0bc-1862-f599-bed6" type="selectionEntry">
+        <entryLink id="44c1-a618-4cc3-6370" name="Callimachus Chrono-Lathe" hidden="false" collective="false" import="true" targetId="b0bc-1862-f599-bed6" type="selectionEntry" sortIndex="1">
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1b00-6d2e-6c6b-60c4" type="min"/>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8248-7785-6815-f330" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="7e48-4282-e240-8699" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="40cf-c845-ac81-afe2" type="selectionEntry">
+        <entryLink id="7e48-4282-e240-8699" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="40cf-c845-ac81-afe2" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
         </entryLink>
-        <entryLink id="0afa-25eb-342b-7894" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="40cf-c845-ac81-afe2" type="selectionEntry">
+        <entryLink id="0afa-25eb-342b-7894" name="Particle Beamer" hidden="false" collective="false" import="true" targetId="40cf-c845-ac81-afe2" type="selectionEntry" sortIndex="4">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
@@ -10033,9 +10201,9 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <infoLink id="2e5d-395a-e7ab-c2ec" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="a67b-36f8-e93b-a3fb" name="Landing Vessel [3.07a]" hidden="false" targetId="4869-03db-33f9-fa82" type="rule"/>
         <infoLink id="117a-60bc-1672-6d4e" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="cafa-46d6-64a2-ddd4" name="Vulnerable Stern [3.07a]" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="cafa-46d6-64a2-ddd4" name="Orichalcite Construction [3.06]" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
         <infoLink id="a7d5-0b1b-8b36-c5cb" name="Muharib" hidden="false" targetId="0363-614a-00d3-ba86" type="profile"/>
-        <infoLink id="b88f-f800-f8c2-2dcc" name="Luminiferous Defences [3.06]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
+        <infoLink id="b88f-f800-f8c2-2dcc" name="Luminiferous Defences [3.07]" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
               <conditionGroups>
@@ -10049,16 +10217,27 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
           </modifiers>
         </infoLink>
         <infoLink id="b33d-c2da-954c-223d" name="Cloud Dive [3.07a]" hidden="false" targetId="52c5-a8f6-6309-f95c" type="rule"/>
-        <infoLink id="6b87-3180-8ae6-de39" name="Janissary Assault Bay [3.06]" hidden="false" targetId="2dad-7a98-4ebc-75d6" type="rule"/>
+        <infoLink id="6b87-3180-8ae6-de39" name="Janissary Assault Bay [3.06]" hidden="false" targetId="2dad-7a98-4ebc-75d6" type="rule">
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="false" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
         <infoLink id="7603-7ff0-e4b9-956b" name="Linear Dash [3.07a]" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
-        <infoLink name="Vulnerable Stern [3.07a]" hidden="false" id="3da0-6f07-c1b5-f0b8" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="3dec-678f-25df-67ec" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="5c24-001a-c134-050b" name="Skyrunner" hidden="false" targetId="0c88-380c-e521-7c86" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="fd4f-486b-ad1d-eb46" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="fd4f-486b-ad1d-eb46" name="Main Weapon" hidden="false" collective="false" import="true" sortIndex="3">
           <constraints>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6db9-f3fa-0422-3085" type="min"/>
             <constraint field="selections" scope="parent" value="2" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5dcd-11c2-b2d8-6fea" type="max"/>
@@ -10070,7 +10249,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f592-9009-ef08-e3b5" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="c1c3-5e86-5afc-f398" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="c1c3-5e86-5afc-f398" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -10081,7 +10260,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="863c-c1f7-76ed-c119" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="863c-c1f7-76ed-c119" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -10092,7 +10271,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3"/>
                   </costs>
                 </entryLink>
-                <entryLink id="1dc4-2ee3-5e79-cb7f" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="1dc4-2ee3-5e79-cb7f" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
                   </modifiers>
@@ -10108,7 +10287,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e2ae-3970-5082-55ab" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="703a-51a2-a9d6-cdfe" name="Advanced Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+                <entryLink id="703a-51a2-a9d6-cdfe" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry" sortIndex="1">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -10119,7 +10298,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
                   </costs>
                 </entryLink>
-                <entryLink id="4d57-88a5-d65d-0ac7" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                <entryLink id="4d57-88a5-d65d-0ac7" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry" sortIndex="2">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -10130,7 +10309,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3"/>
                   </costs>
                 </entryLink>
-                <entryLink id="ba21-dc0c-2cd0-cf55" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                <entryLink id="ba21-dc0c-2cd0-cf55" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry" sortIndex="3">
                   <modifiers>
                     <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
                   </modifiers>
@@ -10144,7 +10323,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="748d-0bfb-04db-a4f2" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
+        <entryLink id="748d-0bfb-04db-a4f2" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry" sortIndex="2">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
@@ -10153,10 +10332,10 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5620-eff8-9fe5-7a5a" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="ce2a-2bdf-f999-590c" name="Sabiha SRS" hidden="false" collective="false" import="true" targetId="8b86-c3f0-5464-c54d" type="selectionEntry"/>
+        <entryLink id="ce2a-2bdf-f999-590c" name="Sabiha SRS" hidden="false" collective="false" import="true" targetId="8b86-c3f0-5464-c54d" type="selectionEntry" sortIndex="1"/>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="90"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="85"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
@@ -10167,22 +10346,21 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       </constraints>
       <infoLinks>
         <infoLink id="11fc-13c2-091f-f786" name="Agile [3.07a]" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="bdbe-3516-dbcb-d699" name="Armoured Decking [3.07a]" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="c882-b2b2-d7b0-786a" name="Cruor [3.06]" hidden="false" targetId="fd53-7d70-2295-859c" type="rule"/>
-        <infoLink id="5c72-0d99-041c-d246" name="Portal Mastery [3.06]" hidden="false" targetId="db90-0b63-d0f9-5222" type="rule"/>
+        <infoLink id="c882-b2b2-d7b0-786a" name="Cruor [3.07]" hidden="false" targetId="fd53-7d70-2295-859c" type="rule"/>
+        <infoLink id="5c72-0d99-041c-d246" name="Master Portal Generator [3.07]" hidden="false" targetId="db90-0b63-d0f9-5222" type="rule"/>
         <infoLink id="b741-470c-c6d6-f20d" name="Colossus [3.07a]" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
         <infoLink id="e710-028f-ef48-803c" name="Powerslide [3.07a]" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="fb22-4d36-894f-a10e" name="Soul Gnawing Dirge [3.06]" hidden="false" targetId="9d00-3fe4-a530-c93b" type="rule"/>
+        <infoLink id="fb22-4d36-894f-a10e" name="Soul Gnawing Dirge [3.07]" hidden="false" targetId="9d00-3fe4-a530-c93b" type="rule"/>
         <infoLink id="8c96-228a-f69e-505f" name="Qualor" hidden="false" targetId="18d4-e728-5686-0af1" type="profile"/>
         <infoLink name="Cor Carolus Icon [3.06]" hidden="false" id="1788-e64c-5bb9-8c2f" targetId="5cc3-215b-4d38-3609" type="rule"/>
-        <infoLink name="Limited Generation [3.06]" hidden="false" id="f41d-8a3e-d018-19b2" targetId="f581-17a1-44d1-abcf" type="rule"/>
+        <infoLink name="Limited Generation [3.07]" hidden="false" id="f41d-8a3e-d018-19b2" targetId="f581-17a1-44d1-abcf" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="46e7-415b-e534-63f5" name="Vitruvian Colossus" hidden="false" targetId="8ecc-741e-13ac-3fd8" primary="false"/>
         <categoryLink id="e749-e883-a129-106f" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="3ed2-def7-456a-9b44" name="Helio Blast" hidden="false" collective="false" import="true" targetId="18cb-9f26-bdc9-fb3b" type="selectionEntry">
+        <entryLink id="3ed2-def7-456a-9b44" name="Helio Blast" hidden="false" collective="false" import="true" targetId="18cb-9f26-bdc9-fb3b" type="selectionEntry" sortIndex="3">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -10191,8 +10369,13 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fcb6-cbe6-610a-ba3a" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="9d23-3d72-7f06-a4f9" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
-        <entryLink import="true" name="Mirage generator" hidden="false" id="cff5-c0e8-ddcd-96bd" collective="false" targetId="163e-8002-bc82-d20f" type="selectionEntry">
+        <entryLink id="9d23-3d72-7f06-a4f9" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="2">
+          <modifiers>
+            <modifier type="set" value="Portal generator (1)" field="name"/>
+            <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+          </modifiers>
+        </entryLink>
+        <entryLink import="true" name="Mirage generator" hidden="false" id="cff5-c0e8-ddcd-96bd" collective="false" targetId="163e-8002-bc82-d20f" type="selectionEntry" sortIndex="1">
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
           </costs>
@@ -10233,6 +10416,231 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry type="model" import="true" name="Titan" hidden="false" id="862a-f729-aadb-a068" publicationId="d854-a2d6-3d52-44c4" collective="false">
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="bd64-715e-ae4d-f292" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
+      <infoLinks>
+        <infoLink name="Titan" id="5c41-70b3-ccc5-8ccc" hidden="false" targetId="c13b-4ce6-b456-9e2d" type="profile">
+          <modifiers>
+            <modifier type="set" value="6/4" field="ff43-364b-8da9-bce9">
+              <conditions>
+                <condition type="greaterThan" value="0" field="selections" scope="862a-f729-aadb-a068" childId="6edc-1362-a6af-266f" shared="false" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </infoLink>
+        <infoLink name="Devil’s Own Luck [3.07a]" id="61d5-7d25-9e55-aa44" hidden="false" targetId="da8d-c041-fd15-a8de" type="rule"/>
+        <infoLink name="Strategic Asset [3.07a]" id="fbd4-7e02-e8ff-dee0" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
+        <infoLink name="Useful Freight [3.07a]" id="fc86-2248-79cb-8550" hidden="false" targetId="2fcd-3a8e-8d93-52af" type="rule"/>
+        <infoLink name="Forward Deployment [3.07a]" id="0ae8-42ab-5f85-8ced" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink name="Mass Conveyor" hidden="false" id="d5d8-d55b-5b9a-4ff6" targetId="3f30-c76a-7405-ea2" primary="false"/>
+        <categoryLink name="Sultanate" hidden="false" id="f21e-a9f7-483e-1382" targetId="9c13-9a46-5ee3-4981" primary="true"/>
+      </categoryLinks>
+      <selectionEntries>
+        <selectionEntry type="upgrade" import="true" name="Grand Conveyor" hidden="false" id="6edc-1362-a6af-266f" collective="false" sortIndex="2">
+          <constraints>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="d270-0537-4d18-a3b5" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </constraints>
+          <costs>
+            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
+          </costs>
+        </selectionEntry>
+      </selectionEntries>
+      <selectionEntryGroups>
+        <selectionEntryGroup name="Main Weapon" id="28c5-e345-edf3-9e9d" hidden="false" collective="false" import="true" defaultSelectionEntryId="6b9b-0de9-6416-5c8b" sortIndex="5">
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="97f8-4f8f-a9ac-6a81" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="a3b1-0c59-cfb7-cc7b" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </constraints>
+          <entryLinks>
+            <entryLink import="true" name="Gun Battery" hidden="false" id="6b9b-0de9-6416-5c8b" collective="false" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
+              </modifiers>
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="a3d4-b543-99ef-2f4c" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+            </entryLink>
+            <entryLink import="true" name="Aetheric Lance" hidden="false" id="3f67-7d5c-0091-7d8c" collective="false" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
+              </modifiers>
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="054b-a39d-6399-f7d1" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
+              </costs>
+            </entryLink>
+            <entryLink import="true" name="Rocket Battery" hidden="false" id="4260-d582-21f7-6c37" collective="false" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
+              </modifiers>
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="c935-0141-4985-ffe0" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
+        <selectionEntryGroup name="Escort Model" id="c03e-f52c-8834-c015" hidden="false" collective="false" import="true" sortIndex="1">
+          <entryLinks>
+            <entryLink import="true" name="Escort Token" hidden="false" id="9a2c-124b-32f7-54e2" collective="false" targetId="9cc1-48f6-f9ea-943f" type="selectionEntry">
+              <modifiers>
+                <modifier type="set" value="true" field="hidden"/>
+              </modifiers>
+              <constraints>
+                <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="8bac-3756-489a-1237" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <constraint type="max" value="4" field="selections" scope="parent" shared="true" id="7aa3-4ea8-2f66-c4f2" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+              <categoryLinks>
+                <categoryLink name="Escort Class" hidden="false" id="5cee-0792-958f-1718" targetId="a8dc-2c16-e614-7894" primary="false"/>
+              </categoryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
+              </costs>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <entryLinks>
+        <entryLink import="true" name="Shield generator" hidden="false" id="980e-a968-3641-dec7" collective="false" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="3">
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="59b0-0d35-6f58-cf6c" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </constraints>
+        </entryLink>
+        <entryLink import="true" name="Portal generator" hidden="false" id="a0c4-f513-4e5f-2e66" collective="false" targetId="74b0-d10f-4a04-5321" type="selectionEntry" sortIndex="4">
+          <modifiers>
+            <modifier type="set" value="Portal generator (1)" field="name"/>
+            <modifier type="add" value="0c85-39c7-9145-efeb" field="category"/>
+          </modifiers>
+        </entryLink>
+      </entryLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="100"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
+      </costs>
+      <modifiers>
+        <modifier type="remove" value="9c13-9a46-5ee3-4981" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="bee0-e82f-b4d3-8590" field="category">
+          <conditions>
+            <condition type="greaterThan" value="0" field="selections" scope="parent" childId="6edc-1362-a6af-266f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+    </selectionEntry>
+    <selectionEntry type="model" import="true" name="Titan Olympia-pattern" hidden="false" id="a272-e62d-99f9-289c" publicationId="d854-a2d6-3d52-44c4" collective="false">
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="1d9b-8403-5759-7716" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+      </constraints>
+      <infoLinks>
+        <infoLink name="Titan" id="6f89-bb3d-313a-6fbd" hidden="false" targetId="c13b-4ce6-b456-9e2d" type="profile">
+          <modifiers>
+            <modifier type="set" value="6/4" field="ff43-364b-8da9-bce9">
+              <conditions>
+                <condition type="greaterThan" value="0" field="selections" scope="a272-e62d-99f9-289c" childId="dfe1-e388-60c2-de11" shared="false" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </infoLink>
+        <infoLink name="Devil’s Own Luck [3.07a]" id="645e-da47-7ed9-1b47" hidden="false" targetId="da8d-c041-fd15-a8de" type="rule"/>
+        <infoLink name="Strategic Asset [3.07a]" id="bdeb-2ae0-f873-9616" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
+        <infoLink name="Useful Freight [3.07a]" id="e378-2772-8b99-1ba8" hidden="false" targetId="2fcd-3a8e-8d93-52af" type="rule"/>
+        <infoLink name="Forward Deployment [3.07a]" id="fd50-3b3a-76dd-1ee3" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink name="Mass Conveyor" hidden="false" id="24c5-3c5f-47c3-3023" targetId="3f30-c76a-7405-ea2" primary="false"/>
+        <categoryLink name="Sultanate" hidden="false" id="48ac-26ea-9916-e4ed" targetId="9c13-9a46-5ee3-4981" primary="true"/>
+      </categoryLinks>
+      <selectionEntries>
+        <selectionEntry type="upgrade" import="true" name="Grand Conveyor" hidden="false" id="dfe1-e388-60c2-de11" collective="false" sortIndex="1">
+          <constraints>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="1812-ebcc-58c5-3e85" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </constraints>
+          <costs>
+            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
+          </costs>
+        </selectionEntry>
+      </selectionEntries>
+      <selectionEntryGroups>
+        <selectionEntryGroup name="Main Weapon" id="24af-564b-64ce-c1ce" hidden="false" collective="false" import="true" defaultSelectionEntryId="b919-fd7e-85d7-95b2" sortIndex="3">
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="9870-06ea-dd9e-7ae9" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="8141-e71a-8d8a-456f" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </constraints>
+          <entryLinks>
+            <entryLink import="true" name="Gun Battery" hidden="false" id="b919-fd7e-85d7-95b2" collective="false" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
+              </modifiers>
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="5beb-c806-d514-e046" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+            </entryLink>
+            <entryLink import="true" name="Aetheric Lance" hidden="false" id="6276-ec5d-a5cf-9649" collective="false" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
+              </modifiers>
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="da9a-3ef0-d7e9-e748" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5"/>
+              </costs>
+            </entryLink>
+            <entryLink import="true" name="Rocket Battery" hidden="false" id="b387-23ce-b6d8-390b" collective="false" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" value="db84-bb03-d026-c3a5" field="category"/>
+              </modifiers>
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="121c-a3b5-59fd-76c4" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <entryLinks>
+        <entryLink import="true" name="Shield generator" hidden="false" id="75ab-2dc4-cc7f-cfc2" collective="false" targetId="596e-bbf7-4be2-d494" type="selectionEntry" sortIndex="2">
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="fc23-3367-9c9e-0961" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </constraints>
+        </entryLink>
+      </entryLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="110"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
+      </costs>
+      <modifiers>
+        <modifier type="remove" value="9c13-9a46-5ee3-4981" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="bee0-e82f-b4d3-8590" field="category">
+          <conditions>
+            <condition type="greaterThan" value="0" field="selections" scope="parent" childId="dfe1-e388-60c2-de11" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+    </selectionEntry>
   </sharedSelectionEntries>
   <sharedSelectionEntryGroups>
     <selectionEntryGroup id="288f-d769-8b45-c2f5" name="Attached Unit [Turkish Surface]" hidden="false" collective="false" import="true">
@@ -10242,7 +10650,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <selectionEntries>
         <selectionEntry id="dfe7-26d7-05f7-8c09" name="Aydin Supply Ship" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
           <categoryLinks>
-            <categoryLink id="8041-d757-83ac-dfd8" name="Aydin Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false"/>
+            <categoryLink id="8041-d757-83ac-dfd8" name="Aydin-Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false"/>
             <categoryLink id="4c13-ba19-1400-49a4" name="Unit" hidden="false" targetId="d216-bc05-71f1-0fb4" primary="true"/>
           </categoryLinks>
           <selectionEntryGroups>
@@ -10265,11 +10673,11 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntry>
         <selectionEntry id="54a6-f17e-b810-370b" name="Konya Mainteinance Ship" hidden="false" collective="false" import="true" type="unit">
           <categoryLinks>
-            <categoryLink id="51f9-1fdf-0e00-10ce" name="Unit" hidden="false" targetId="d216-bc05-71f1-0fb4" primary="true"/>
-            <categoryLink id="e115-6f20-d83b-f18b" name="Konya Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false"/>
+            <categoryLink name="Sultanate" hidden="false" id="10a5-7bad-f3c4-c8fb" targetId="9c13-9a46-5ee3-4981" primary="true"/>
+            <categoryLink name="Heavy Platform" hidden="false" id="e701-109e-3a1a-50a1" targetId="fbfb-0ffd-73fa-8e0a" primary="false"/>
           </categoryLinks>
           <selectionEntryGroups>
-            <selectionEntryGroup id="b488-48f8-95ad-68bf" name="Escort" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="b488-48f8-95ad-68bf" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
               <entryLinks>
                 <entryLink id="8781-b5fa-0762-66b2" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
                   <modifiers>
@@ -10284,7 +10692,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
           <entryLinks>
-            <entryLink id="af64-f0bf-8e80-023f" name="Konya" hidden="false" collective="false" import="true" targetId="214f-c8dd-b137-8c10" type="selectionEntry"/>
+            <entryLink id="af64-f0bf-8e80-023f" name="Konya" hidden="false" collective="false" import="true" targetId="214f-c8dd-b137-8c10" type="selectionEntry" sortIndex="2"/>
           </entryLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
@@ -10293,7 +10701,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntry>
         <selectionEntry id="d00e-e402-899a-27c3" name="Temir Frigate Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
           <categoryLinks>
-            <categoryLink id="db7c-b671-c8b3-87d6" name="Temir Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false"/>
+            <categoryLink id="db7c-b671-c8b3-87d6" name="Temir-Class" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false"/>
             <categoryLink id="988f-9938-3a53-492e" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
             <categoryLink id="f438-7ef4-119a-664e" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
           </categoryLinks>
@@ -10328,7 +10736,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         </selectionEntry>
         <selectionEntry id="af69-3537-a0ad-ef37" name="Pasha Light Cruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
           <categoryLinks>
-            <categoryLink id="179e-1f74-7eb2-5e53" name="Pasha Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false"/>
+            <categoryLink id="179e-1f74-7eb2-5e53" name="Pasha-Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false"/>
             <categoryLink id="35e5-fa99-4f55-e3f2" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
             <categoryLink id="d7dd-6685-c499-2992" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
           </categoryLinks>
@@ -10367,12 +10775,12 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <selectionEntries>
         <selectionEntry id="5003-4489-b217-4ace" name="Jebel Battle Platforms" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
           <categoryLinks>
-            <categoryLink id="694c-8fc8-c97c-920e" name="Jebel Class" hidden="false" targetId="2299-2547-ad8f-b67f" primary="false"/>
+            <categoryLink id="694c-8fc8-c97c-920e" name="Jebel-Class" hidden="false" targetId="2299-2547-ad8f-b67f" primary="false"/>
             <categoryLink id="6eb8-ba5f-8d07-fc3d" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
             <categoryLink id="20ec-95a9-2dbe-d6f3" name="Tripolitanian" hidden="false" targetId="6a30-e049-f4d0-67f5" primary="false"/>
           </categoryLinks>
           <selectionEntryGroups>
-            <selectionEntryGroup id="bc80-ab22-470e-13fd" name="Escort" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="bc80-ab22-470e-13fd" name="Escort" hidden="false" collective="false" import="true" sortIndex="1">
               <constraints>
                 <constraint field="selections" scope="parent" value="2" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a516-a70c-0449-1ba7" type="max"/>
               </constraints>
@@ -10382,7 +10790,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
           <entryLinks>
-            <entryLink id="b0c7-89d9-f17c-62e8" name="Jebel" hidden="false" collective="false" import="true" targetId="2a1d-b7e0-198d-61a4" type="selectionEntry">
+            <entryLink id="b0c7-89d9-f17c-62e8" name="Jebel" hidden="false" collective="false" import="true" targetId="2a1d-b7e0-198d-61a4" type="selectionEntry" sortIndex="2">
               <modifiers>
                 <modifier type="set" field="3f59-c49b-f4bd-38a9" value="1"/>
               </modifiers>
@@ -10402,7 +10810,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
       <selectionEntries>
         <selectionEntry id="6e84-7848-9119-d8fb" name="Carolus Destroyer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
           <categoryLinks>
-            <categoryLink id="1ca5-94fb-2d8c-785e" name="Carolus Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false"/>
+            <categoryLink id="1ca5-94fb-2d8c-785e" name="Carolus-Class" hidden="false" targetId="3897-e89d-4ba8-e894" primary="false"/>
             <categoryLink id="feb4-a6f4-7c8c-dcd1" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
             <categoryLink id="6b84-5d5d-8f85-f967" name="Order" hidden="false" targetId="0982-cae3-3850-722a" primary="false"/>
           </categoryLinks>
@@ -10428,7 +10836,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <selectionEntry id="b445-bbba-9273-7261" name="Alsaqr Skybarques" hidden="false" collective="false" import="true" type="unit">
           <categoryLinks>
             <categoryLink id="d753-ca88-cbae-8940" name="Unit" hidden="false" targetId="d216-bc05-71f1-0fb4" primary="true"/>
-            <categoryLink id="6afc-ac7e-c3c0-848f" name="Alsaqr Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false"/>
+            <categoryLink id="6afc-ac7e-c3c0-848f" name="Alsaqr-Class" hidden="false" targetId="d769-126e-6928-bda2" primary="false"/>
           </categoryLinks>
           <entryLinks>
             <entryLink id="42d3-90bc-fb1a-4dca" name="Alsaqr" hidden="false" collective="false" import="true" targetId="95b4-a4d7-63da-2977" type="selectionEntry">
@@ -10510,14 +10918,14 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
     <profile id="18fb-8f1c-9a38-6871" name="Hashashin" publicationId="d854-a2d6-3d52-44c4" page="7" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">1</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">13</characteristic>
-        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">10</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">11</characteristic>
+        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">9</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">5</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">10</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">11</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">3</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">3</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">5</characteristic>
-        <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">2</characteristic>
+        <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">3</characteristic>
       </characteristics>
     </profile>
     <profile id="3c2c-e106-5263-9455" name="Iskandar" publicationId="d854-a2d6-3d52-44c4" page="8" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
@@ -10812,7 +11220,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">10</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">10</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">5</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">10</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">11</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">3</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">3</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">5</characteristic>
@@ -10825,7 +11233,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">7/6</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">4/3</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/6</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">12/11</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">13/12</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/4</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">5/4</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/7</characteristic>
@@ -10838,7 +11246,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">7/6</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">4/4</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/6</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">12/11</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">13/12</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/4</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">5/4</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/7</characteristic>
@@ -10864,7 +11272,7 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
         <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">7/6</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">4/3</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/6</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">12/11</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">13/12</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/4</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">5/4</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">9/8</characteristic>
@@ -10887,20 +11295,20 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
     <profile id="515f-4ea8-7919-b3f7" name="Awsbiri" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">8/7</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">9/8</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">6/5</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/5</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">10/10</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">11/10</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/3</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0/0</characteristic>
-        <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/6</characteristic>
+        <characteristic name="Fray" typeId="4c54-804a-8993-7325">9/8</characteristic>
         <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/2</characteristic>
       </characteristics>
     </profile>
     <profile id="27ce-8bc7-7c97-9a8d" name="Chaska" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">9/8</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">8/7</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">6/5</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">7/7</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">14/13</characteristic>
@@ -10913,26 +11321,26 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
     <profile id="db9a-437a-dc9c-6593" name="Hırka" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">1</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">9</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">10</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">6</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">5</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">11</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">4</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0</characteristic>
-        <characteristic name="Fray" typeId="4c54-804a-8993-7325">4</characteristic>
+        <characteristic name="Fray" typeId="4c54-804a-8993-7325">6</characteristic>
         <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4</characteristic>
       </characteristics>
     </profile>
     <profile id="9cc1-8cb2-dece-7561" name="Nasr" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">8/7</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">9/8</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">6/5</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/5</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">10/10</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">11/10</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/3</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0/0</characteristic>
-        <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/6</characteristic>
+        <characteristic name="Fray" typeId="4c54-804a-8993-7325">9/8</characteristic>
         <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/2</characteristic>
       </characteristics>
     </profile>
@@ -11056,20 +11464,20 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
     <profile id="0363-614a-00d3-ba86" name="Muharib" publicationId="d854-a2d6-3d52-44c4" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">8/7</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">9/8</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">6/5</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/5</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">10/10</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">11/10</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/3</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0/0</characteristic>
-        <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/6</characteristic>
+        <characteristic name="Fray" typeId="4c54-804a-8993-7325">9/8</characteristic>
         <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/2</characteristic>
       </characteristics>
     </profile>
     <profile id="18d4-e728-5686-0af1" name="Qualor" publicationId="d854-a2d6-3d52-44c4" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">9/8</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">8/7</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">6/5</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">7/7</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">14/13</characteristic>
@@ -11087,4 +11495,62 @@ Review 3.06.00: update to ORBAT 3.06 rev2</readme>
     <catalogueLink id="5b05-5612-5379-9009" name="Common" targetId="f2ed-a910-ca64-9be7" type="catalogue" importRootEntries="true"/>
     <catalogueLink type="catalogue" name="Enlightened Automata" id="3311-2521-6809-4cb9" targetId="68f4-e16c-8755-4269"/>
   </catalogueLinks>
+  <entryLinks>
+    <entryLink import="true" name="Titan Mass Conveyor" hidden="true" id="6674-20dd-d036-494c" collective="false" targetId="862a-f729-aadb-a068" type="selectionEntry">
+      <modifiers>
+        <modifier type="set" value="false" field="hidden">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="1" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <categoryLinks>
+        <categoryLink name="Surface Unit" hidden="false" id="9e67-5bf0-6d32-2690" targetId="464e-890a-84b2-8ce9" primary="true"/>
+        <categoryLink name="Titan-clas" hidden="false" id="14ab-9442-aa6e-ec7e" targetId="63d9-de30-71f7-b539" primary="false"/>
+      </categoryLinks>
+    </entryLink>
+    <entryLink import="true" name="Titan Olympia-pattern" hidden="true" id="5286-0056-20b7-9526" collective="false" targetId="a272-e62d-99f9-289c" type="selectionEntry">
+      <modifiers>
+        <modifier type="set" value="false" field="hidden">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="force" childId="1d1b-a7dc-5580-855f" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <condition type="instanceOf" value="1" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
+        <modifier type="remove" value="03eb-089a-0c01-5751" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+        <modifier type="add" value="8f91-9e5a-36f5-036a" field="category">
+          <conditions>
+            <condition type="instanceOf" value="0" field="selections" scope="force" childId="05bf-6a5e-ead2-512c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <categoryLinks>
+        <categoryLink name="Skimming Unit" hidden="false" id="6e66-f23c-370c-6a54" targetId="3b53-19a3-12fd-34b1" primary="true"/>
+        <categoryLink name="Titan-clas" hidden="false" id="cceb-c85e-0c9f-aca1" targetId="63d9-de30-71f7-b539" primary="false"/>
+      </categoryLinks>
+    </entryLink>
+  </entryLinks>
 </catalogue>
diff --git a/Union.cat b/Union.cat
index f495eba..6208cd8 100644
--- a/Union.cat
+++ b/Union.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="caf4-134c-500d-0cd9" name="Union v3.07a" revision="13" battleScribeVersion="2.03" authorName="Riccardo Sipone, UrsinePatriarch" authorContact="siponeric@hotmail.com /// Discord: zharrpostingghoroth" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="12" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="caf4-134c-500d-0cd9" name="Union v3.07a" revision="14" battleScribeVersion="2.03" authorName="Riccardo Sipone, UrsinePatriarch" authorContact="siponeric@hotmail.com /// Discord: zharrpostingghoroth" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="12" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <comment>Union ORBAT 3.07a (published 19/04/2024)</comment>
   <readme>Review 1.03.00: Initial release
 Review 3.03.00: Update to Orbat 3.03
@@ -4558,7 +4558,7 @@ Review 3.07.a1: corrections (18/08/2024)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="d38f-2b6c-86b3-c210" name="California Supply Cruiser" publicationId="e6a1-85d3-8979-7880" hidden="true" collective="false" import="true" type="model">
+    <selectionEntry id="d38f-2b6c-86b3-c210" name="California Supply Cruiser" publicationId="e6a1-85d3-8979-7880" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="8c76-02bc-ae30-b408" type="max"/>
       </constraints>
@@ -9657,8 +9657,7 @@ Review 3.07.a1: corrections (18/08/2024)</readme>
                 <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
               </costs>
               <constraints>
-                <constraint type="min" value="3" field="selections" scope="parent" shared="true" id="fdbf-b0cb-619b-2cb0" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-                <constraint type="max" value="3" field="selections" scope="parent" shared="false" id="0f13-b726-7377-a951" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="0f13-b726-7377-a951" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </constraints>
               <infoLinks>
                 <infoLink name="Lexington" id="db62-cbb2-a745-7b4f" hidden="false" targetId="9de9-ec3d-32c6-cf94" type="profile">
@@ -9677,6 +9676,13 @@ Review 3.07.a1: corrections (18/08/2024)</readme>
                   </modifiers>
                 </infoLink>
               </infoLinks>
+              <modifiers>
+                <modifier type="set" value="0" field="0f13-b726-7377-a951">
+                  <conditions>
+                    <condition type="greaterThan" value="1" field="selections" scope="parent" childId="e920-9314-a5da-61a1" shared="true"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
             </selectionEntry>
             <selectionEntry id="e920-9314-a5da-61a1" name="[Basic Pattern]" publicationId="e6a1-85d3-8979-7880" hidden="false" collective="false" import="true" type="model" sortIndex="1">
               <entryLinks>
@@ -9741,8 +9747,7 @@ Review 3.07.a1: corrections (18/08/2024)</readme>
                 <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
               </costs>
               <constraints>
-                <constraint type="min" value="3" field="selections" scope="parent" shared="true" id="f040-acf5-5759-a744" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-                <constraint type="max" value="3" field="selections" scope="parent" shared="false" id="9536-769a-622f-7a7e" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="false" id="bccf-1f84-a633-0f77" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </constraints>
               <infoLinks>
                 <infoLink name="Lexington" id="8617-469a-3ac0-d55b" hidden="false" targetId="9de9-ec3d-32c6-cf94" type="profile">
@@ -9761,6 +9766,13 @@ Review 3.07.a1: corrections (18/08/2024)</readme>
                   </modifiers>
                 </infoLink>
               </infoLinks>
+              <modifiers>
+                <modifier type="set" value="0" field="bccf-1f84-a633-0f77">
+                  <conditions>
+                    <condition type="greaterThan" value="1" field="selections" scope="parent" childId="e47f-fb30-ed8a-7d66" shared="true"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
             </selectionEntry>
           </selectionEntries>
         </selectionEntryGroup>
@@ -11661,27 +11673,27 @@ Review 3.07.a1: corrections (18/08/2024)</readme>
       <entryLinks>
         <entryLink id="58eb-62a3-0d8b-29c0" name="Roanoke Strike Carrier Squadron" hidden="false" collective="false" import="true" targetId="ef70-fbbe-ddd5-ead6" type="selectionEntry">
           <categoryLinks>
-            <categoryLink id="af8f-c247-31ff-4bdb" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="false"/>
+            <categoryLink id="af8f-c247-31ff-4bdb" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
           </categoryLinks>
         </entryLink>
         <entryLink id="4ab5-af0c-a684-4b3e" name="Springfield Corvette Squadron" hidden="false" collective="false" import="true" targetId="405a-326a-ab31-7b7a" type="selectionEntry">
           <categoryLinks>
-            <categoryLink id="ecc2-1718-a7ab-3cb9" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="false"/>
+            <categoryLink id="ecc2-1718-a7ab-3cb9" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
           </categoryLinks>
         </entryLink>
         <entryLink id="2a1e-38ab-f272-7a32" name="Providence Merchantman" hidden="false" collective="false" import="true" targetId="0887-558f-85d0-1a08" type="selectionEntry">
           <categoryLinks>
-            <categoryLink id="dcb0-9d81-991d-5101" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="false"/>
+            <categoryLink id="dcb0-9d81-991d-5101" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
           </categoryLinks>
         </entryLink>
         <entryLink id="e5c7-4aa0-e841-6313" name="Montgomery Support Ship" hidden="false" collective="false" import="true" targetId="0b7f-bc4f-eed8-e4a4" type="selectionEntry">
           <categoryLinks>
-            <categoryLink id="43d9-8b14-6b04-79d3" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="false"/>
+            <categoryLink id="43d9-8b14-6b04-79d3" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
           </categoryLinks>
         </entryLink>
         <entryLink id="3e14-d778-511d-043c" name="California Supply Cruiser" hidden="false" collective="false" import="true" targetId="d38f-2b6c-86b3-c210" type="selectionEntry">
           <categoryLinks>
-            <categoryLink id="83e3-ee0d-575e-3c36" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="false"/>
+            <categoryLink id="83e3-ee0d-575e-3c36" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
           </categoryLinks>
         </entryLink>
       </entryLinks>
diff --git a/Weapon.cat b/Weapon.cat
index e34971b..d234088 100644
--- a/Weapon.cat
+++ b/Weapon.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="526f-06e7-edaa-02b8" name="Weapon" revision="25" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar, UrsinePatriarch" authorContact="siponeric@hotmail.com / Discord: zharrpostingghoroth" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="12" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
+<catalogue id="526f-06e7-edaa-02b8" name="Weapon" revision="26" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar, UrsinePatriarch" authorContact="siponeric@hotmail.com / Discord: zharrpostingghoroth" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="12" xmlns="http://www.battlescribe.net/schema/catalogueSchema" type="catalogue">
   <readme>Weapon collection
 Review v1: starting document
 Review v2: imprevment to follow ORBAT requirments
@@ -210,7 +210,7 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
         </infoLink>
         <infoLink id="5a2a-0b9a-c9f9-2454" name="Fusillade [3.04]" hidden="false" targetId="4ec1-3aa3-001e-f8f6" type="rule"/>
         <infoLink id="c15a-749c-e7e8-83b8" name="Broadside [3.04]" hidden="false" targetId="cb94-70c0-65b8-d3d0" type="rule"/>
-        <infoLink name="Leithal [3.06a]" id="31c8-0831-5107-b5ef" hidden="true" targetId="b69f-fa1a-3d60-aa9b" type="rule">
+        <infoLink name="Leithal [3.06a]" id="31c8-0831-5107-b5ef" hidden="false" targetId="b69f-fa1a-3d60-aa9b" type="rule">
           <modifiers>
             <modifier type="set" value="false" field="hidden">
               <conditions>
@@ -276,6 +276,18 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
               </modifiers>
             </modifierGroup>
           </modifierGroups>
+          <modifiers>
+            <modifier type="append" value="(Port First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="55de-fe5d-650a-2f4a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="801-696b-9bb1-e4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+          </modifiers>
         </infoLink>
         <infoLink id="d6eb-a4e3-e1e3-d6c7" name="Torpedo [3.04]" hidden="false" targetId="d673-c4da-202e-fbfc" type="rule"/>
         <infoLink id="1950-1b32-0c95-0320" name="Extreme Range [3.04]" hidden="false" targetId="d3ac-5484-ad1a-0c87" type="rule"/>
@@ -1654,6 +1666,26 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
                 <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="9512-6963-5c9a-e15f" shared="true"/>
               </conditions>
             </modifier>
+            <modifier type="append" value="(Port First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="55de-fe5d-650a-2f4a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e1e9-a88-1bb-b8aa" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="801-696b-9bb1-e4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="a036-e1b6-ee86-ebf7" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <modifierGroups>
             <modifierGroup>
@@ -2114,64 +2146,74 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
       <infoLinks>
         <infoLink id="8f38-3385-685c-09c6" name="Gun Battery" hidden="false" targetId="4039-8987-0943-016d" type="profile">
           <modifiers>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front Second)">
+            <modifier type="append" value="1st" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c595-958b-800e-2c04" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8dd5-28b8-39fb-6304" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front First)">
+            <modifier type="append" value="2nd" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="62c7-5eb0-d38e-486" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="2a6f-36d6-5d75-e9fc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(First)">
+            <modifier type="append" value="3rd" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dd5-28b8-39fb-6304" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="df04-304e-3eb9-52b" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Second)">
+            <modifier type="append" value="4th" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2a6f-36d6-5d75-e9fc" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="5650-1732-3d85-61a6" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Starboard First)">
+            <modifier type="append" value="(First)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="801-696b-9bb1-e4ef" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8dd5-28b8-39fb-6304" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Starboard Second)">
+            <modifier type="append" value="(Second)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a036-e1b6-ee86-ebf7" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="2a6f-36d6-5d75-e9fc" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Port First)">
+            <modifier type="append" value="(Front First)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="55de-fe5d-650a-2f4a" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="62c7-5eb0-d38e-486" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Port Second)">
+            <modifier type="append" value="(Front Second)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e1e9-a88-1bb-b8aa" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="c595-958b-800e-2c04" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="1st">
+            <modifier type="append" value="(Port First)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8dd5-28b8-39fb-6304" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="55de-fe5d-650a-2f4a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="2nd">
+            <modifier type="append" value="(Port Second)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2a6f-36d6-5d75-e9fc" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e1e9-a88-1bb-b8aa" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="3rd">
+            <modifier type="append" value="(Port Third)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="df04-304e-3eb9-52b" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="0c23-0110-ee82-8551" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="4th">
+            <modifier type="append" value="(Starboard First)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5650-1732-3d85-61a6" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="801-696b-9bb1-e4ef" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starboard Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="a036-e1b6-ee86-ebf7" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starboard Third)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="cbe3-a4d6-4d7d-9a4c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -2366,6 +2408,26 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
                 <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="df04-304e-3eb9-52b" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
+            <modifier type="append" value="(Port First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="55de-fe5d-650a-2f4a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e1e9-a88-1bb-b8aa" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="801-696b-9bb1-e4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="a036-e1b6-ee86-ebf7" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <modifierGroups>
             <modifierGroup>
@@ -3481,9 +3543,9 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="e3d2-a74b-69dd-e97a" name="Advanced Aetheric Lance" publicationId="5a03-1c6f-8fc8-2be1" hidden="false" collective="false" import="true" type="upgrade">
+    <selectionEntry id="e3d2-a74b-69dd-e97a" name="Aetheric Lance" publicationId="5a03-1c6f-8fc8-2be1" hidden="false" collective="false" import="true" type="upgrade">
       <infoLinks>
-        <infoLink id="44e3-cc09-f558-6610" name="Advanced Aetheric Lance" hidden="false" targetId="502c-add9-c3b2-02ab" type="profile">
+        <infoLink id="44e3-cc09-f558-6610" name="Aetheric Lance" hidden="false" targetId="502c-add9-c3b2-02ab" type="profile">
           <modifierGroups>
             <modifierGroup>
               <modifiers>
@@ -3540,6 +3602,48 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
               </modifiers>
             </modifierGroup>
           </modifierGroups>
+          <modifiers>
+            <modifier type="append" value="1st" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8dd5-28b8-39fb-6304" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="2nd" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="2a6f-36d6-5d75-e9fc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="55de-fe5d-650a-2f4a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starboard First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="801-696b-9bb1-e4ef" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e1e9-a88-1bb-b8aa" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starboard Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="a036-e1b6-ee86-ebf7" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port Third)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="0c23-0110-ee82-8551" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starboard Third)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="cbe3-a4d6-4d7d-9a4c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+          </modifiers>
         </infoLink>
         <infoLink id="29d6-526f-aea8-839d" name="Sustained [3.04]" hidden="false" targetId="8615-72cb-cdb5-0b1e" type="rule"/>
         <infoLink id="d630-94b0-0f8b-2250" name="Gunnery [3.04]" hidden="false" targetId="c20b-cc1d-12bf-23a8" type="rule"/>
@@ -5445,6 +5549,36 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
                 <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="df04-304e-3eb9-52b" type="instanceOf"/>
               </conditions>
             </modifier>
+            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front First)">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="62c7-5eb0-d38e-486" type="instanceOf"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front Second)">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c595-958b-800e-2c04" type="instanceOf"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="55de-fe5d-650a-2f4a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e1e9-a88-1bb-b8aa" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="801-696b-9bb1-e4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="a036-e1b6-ee86-ebf7" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <modifierGroups>
             <modifierGroup>
@@ -6240,13 +6374,13 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="2492-854e-2179-e50b" name="Advanced Aetheric Lance" publicationId="5a03-1c6f-8fc8-2be1" hidden="false" collective="true" import="true" type="upgrade">
+    <selectionEntry id="2492-854e-2179-e50b" name="Aetheric Lance" publicationId="5a03-1c6f-8fc8-2be1" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e390-dfac-9120-69e4" type="min"/>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0fd5-549b-a3d1-712a" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="ffbc-4e12-15f0-f4f4" name="Advanced Aetheric Lance" hidden="false" targetId="502c-add9-c3b2-02ab" type="profile">
+        <infoLink id="ffbc-4e12-15f0-f4f4" name="Aetheric Lance" hidden="false" targetId="502c-add9-c3b2-02ab" type="profile">
           <modifierGroups>
             <modifierGroup>
               <modifiers>
@@ -6614,49 +6748,54 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
       <infoLinks>
         <infoLink id="4d6e-35e5-6a8a-d44d" name="Rocket Battery" hidden="false" targetId="90e8-0288-ed1a-f4fb" type="profile">
           <modifiers>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front First)">
+            <modifier type="append" value="1st" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="62c7-5eb0-d38e-486" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8dd5-28b8-39fb-6304" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front Second)">
+            <modifier type="append" value="2nd" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c595-958b-800e-2c04" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="2a6f-36d6-5d75-e9fc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Starboard First)">
+            <modifier type="append" value="(Front First)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="801-696b-9bb1-e4ef" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="62c7-5eb0-d38e-486" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Starboard Second)">
+            <modifier type="append" value="(Front Second)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a036-e1b6-ee86-ebf7" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="c595-958b-800e-2c04" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Port First)">
+            <modifier type="append" value="(Port First)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="55de-fe5d-650a-2f4a" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="55de-fe5d-650a-2f4a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Port Second)">
+            <modifier type="append" value="(Port Second)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e1e9-a88-1bb-b8aa" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e1e9-a88-1bb-b8aa" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front First)">
+            <modifier type="append" value="(Port Third)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="62c7-5eb0-d38e-486" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="0c23-0110-ee82-8551" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="1st">
+            <modifier type="append" value="(Starboard First)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8dd5-28b8-39fb-6304" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="801-696b-9bb1-e4ef" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
-            <modifier type="append" field="faa3-d69c-5156-2acf" value="2nd">
+            <modifier type="append" value="(Starboard Second)" field="faa3-d69c-5156-2acf">
               <conditions>
-                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2a6f-36d6-5d75-e9fc" type="instanceOf"/>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="a036-e1b6-ee86-ebf7" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starboard Third)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="cbe3-a4d6-4d7d-9a4c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </modifier>
           </modifiers>
@@ -6729,7 +6868,7 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="10f7-c717-2887-f9ca" name="D-Cannon [3.06]" hidden="false" collective="false" import="true" type="upgrade">
+    <selectionEntry id="10f7-c717-2887-f9ca" name="D-Cannon Battery" hidden="false" collective="false" import="true" type="upgrade">
       <infoLinks>
         <infoLink id="af14-76da-099b-d5fb" name="D-Cannon Battery" hidden="false" targetId="c788-c4d5-c958-7cc8" type="profile">
           <modifierGroups>
@@ -6778,6 +6917,38 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
               </modifiers>
             </modifierGroup>
           </modifierGroups>
+          <modifiers>
+            <modifier type="append" value="(Front First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="62c7-5eb0-d38e-486" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Front Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="c595-958b-800e-2c04" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="55de-fe5d-650a-2f4a" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Port Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="e1e9-a88-1bb-b8aa" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord First)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="801-696b-9bb1-e4ef" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" value="(Starbord Second)" field="faa3-d69c-5156-2acf">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="a036-e1b6-ee86-ebf7" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+          </modifiers>
         </infoLink>
         <infoLink id="f401-8089-dd91-3cd3" name="Aerial [3.05]" hidden="false" targetId="c475-4c4f-de22-9080" type="rule"/>
         <infoLink id="5ea6-2e1e-2994-a39" name="D-Cannon [3.06]" hidden="false" targetId="5f8b-1815-9738-ae2c" type="rule"/>
@@ -9587,8 +9758,8 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
     </selectionEntry>
     <selectionEntry id="2c7d-e3db-f3f3-6a4c" name="Tri-Railgun" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bf67-e89b-fa98-f00f" type="min"/>
-        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dea1-9c0b-a298-2ead" type="max"/>
+        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bf67-e89b-fa98-f00f" type="min"/>
+        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dea1-9c0b-a298-2ead" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="ecbd-b019-38a5-8fff" name="Tri-Railgun" hidden="false" targetId="f219-e9a9-4560-c076" type="profile">
@@ -9757,6 +9928,134 @@ Review v25: modification for Croen 3.06a Orbat (22/07/24)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="f58d-4ccc-5b7f-898e" name="Qaa Magnetic Bombard" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0df5-ed5d-268c-a7a0" type="min"/>
+        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7472-dc08-fda2-83bf" type="max"/>
+      </constraints>
+      <infoLinks>
+        <infoLink id="8485-3755-796e-d433" name="Qaa Magnetic Bombard" hidden="false" targetId="7c54-32fb-8038-e970" type="profile">
+          <modifiers>
+            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front First)">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="62c7-5eb0-d38e-486" type="instanceOf"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Front Second)">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c595-958b-800e-2c04" type="instanceOf"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" field="faa3-d69c-5156-2acf" value="(First)">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dd5-28b8-39fb-6304" type="instanceOf"/>
+              </conditions>
+            </modifier>
+            <modifier type="append" field="faa3-d69c-5156-2acf" value="(Second)">
+              <conditions>
+                <condition field="selections" scope="ancestor" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2a6f-36d6-5d75-e9fc" type="instanceOf"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+          <modifierGroups>
+            <modifierGroup>
+              <modifiers>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="360°">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="a4f6-2208-db34-4879" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="dbb4-72d5-bceb-70b3" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F/P/S">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="db84-bb03-d026-c3a5" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="A/P/S">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="f2af-2773-24ff-2e12" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F/S">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="ce6f-067d-9ad4-ddaa" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F/P">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="c93d-a414-b1bc-7d2c" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="A/P">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="4e9e-7862-58ad-15e6" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="A/S">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5347-4855-4421-ed77" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F/P/A">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="0cd5-1e4e-c51e-c338" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F/S/A">
+                  <conditions>
+                    <condition field="selections" scope="f58d-4ccc-5b7f-898e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5b70-4095-b55c-9745" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+            </modifierGroup>
+          </modifierGroups>
+        </infoLink>
+        <infoLink id="6bb6-8ca2-ccf1-83ac" name="Magnetic [3.04]" hidden="false" targetId="8c21-7eac-4f35-4268" type="rule"/>
+        <infoLink id="7c2b-3d23-4b58-fd26" name="Aerial [3.05]" hidden="false" targetId="c475-4c4f-de22-9080" type="rule"/>
+        <infoLink id="a99a-11a3-9755-4959" name="Extreme Range [3.04]" hidden="false" targetId="d3ac-5484-ad1a-0c87" type="rule"/>
+      </infoLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry id="137c-86a6-036d-f89e" name="Horus Heavy Particle Cannon" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cd52-1785-a5ff-20a9" type="min"/>
+        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f4a8-9666-98d2-db2a" type="max"/>
+      </constraints>
+      <infoLinks>
+        <infoLink id="09ac-dda1-6240-31c0" name="Horus Heavy Particle Cannon" hidden="false" targetId="58f8-353d-f129-e3c9" type="profile">
+          <modifierGroups>
+            <modifierGroup>
+              <modifiers>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="360°">
+                  <conditions>
+                    <condition field="selections" scope="137c-86a6-036d-f89e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="a4f6-2208-db34-4879" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F">
+                  <conditions>
+                    <condition field="selections" scope="137c-86a6-036d-f89e" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="dbb4-72d5-bceb-70b3" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+            </modifierGroup>
+          </modifierGroups>
+        </infoLink>
+        <infoLink id="fca3-602e-5281-3112" name="Blast [3.04]" hidden="false" targetId="89d8-2e21-11be-005d" type="rule"/>
+        <infoLink id="76a6-4dc7-38c8-5c84" name="Piercing [3.04]" hidden="false" targetId="0f8e-056c-75a9-caee" type="rule"/>
+        <infoLink id="3556-6313-5a2b-a854" name="Devastating [3.04]" hidden="false" targetId="d633-3476-6a40-e860" type="rule"/>
+      </infoLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0"/>
+      </costs>
+    </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
     <rule id="c475-4c4f-de22-9080" name="Aerial [3.05]" publicationId="7f09-e243-2307-78d0" hidden="false">
@@ -9978,7 +10277,7 @@ The attacking Player chooses which die result to apply. One of the Action Dice i
         <modifier type="set" value="Heavy Conodontic Flenser" field="name"/>
       </modifiers>
     </rule>
-    <rule name="Leithal [3.06a]" id="b69f-fa1a-3d60-aa9b" hidden="false" publicationId="dbca-8d57-b848-457e">
+    <rule name="Leithal [3.06a]" id="b69f-fa1a-3d60-aa9b" hidden="true" publicationId="dbca-8d57-b848-457e">
       <description>Actions using this Quality gain +1 to their Action Dice Pool when one or more weapons Support their Attack. If after rolling such an Action against an Initial Target within 20”, the number of Exploding Hits rolled is double or greater than the Initial Target’s Mass, then the Action gains the Devastating Quality. If all the weapons when performing a Crossing the T Valour Effect would have had this Quality, then that Valour Effect gains the Leithal Quality.</description>
       <modifiers>
         <modifier type="set" value="Leithal" field="name"/>
@@ -10022,7 +10321,7 @@ The attacking Player chooses which die result to apply. One of the Action Dice i
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Broadside, Sustained</characteristic>
       </characteristics>
     </profile>
-    <profile id="502c-add9-c3b2-02ab" name="Advanced Aetheric Lance" publicationId="908d-6feb-2e9e-843b" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
+    <profile id="502c-add9-c3b2-02ab" name="Aetheric Lance" publicationId="908d-6feb-2e9e-843b" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
         <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">6(4) / 4(2)</characteristic>
@@ -11261,5 +11560,23 @@ The attacking Player chooses which die result to apply. One of the Action Dice i
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Broadside, Sustained (Aerial Units)</characteristic>
       </characteristics>
     </profile>
+    <profile id="7c54-32fb-8038-e970" name="Qaa Magnetic Bombard" publicationId="5a03-1c6f-8fc8-2be1" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
+      <characteristics>
+        <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">-</characteristic>
+        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">9(5) / 7(4)</characteristic>
+        <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">9(5) / 7(4)</characteristic>
+        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Aerial, Magnetic, Extreme Range</characteristic>
+      </characteristics>
+    </profile>
+    <profile id="58f8-353d-f129-e3c9" name="Horus Heavy Particle Cannon" publicationId="908d-6feb-2e9e-843b" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
+      <characteristics>
+        <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">7(4) / 5(3)</characteristic>
+        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">11(6) / 7(4)</characteristic>
+        <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">7(4) / 5(3)</characteristic>
+        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Piercing, Blast, Devastating</characteristic>
+      </characteristics>
+    </profile>
   </sharedProfiles>
 </catalogue>