From 1d705ba90306b2ee4eac12bef5f7fc546ac494fe Mon Sep 17 00:00:00 2001
From: The4D6 <monty.coyle19@gmail.com>
Date: Thu, 6 Jun 2024 18:56:58 +0100
Subject: [PATCH] Big List of Fixes (#3214)

* Fixed #3213 - Rapier Battery Costs

* Fixed# 3212 - Removed hidden on dreadclaw/kharybdis in covenant of Fire

* Fixed #3211 - In Disgrace stat choice root selection visible

* Added types and sub types to all fortifications

* Rm kharash and fnp5+ from unique ICs

* Create the rules for Hibou Khan (#3227)


* Valdor is back babyyyyy

* Fixed Jarl hiding issue

* Made centurion min 1 in Reaving

* Fix Heavy sentinel in recon company check (#3232)

* MAde horus aximand not show up in loyalist lists

* Added primarch unit classification beck to Alpharius

* Added max1 to company command squad in Optae

* Removed import from optae not in AL cat

* Fixed 1kSons not getting powers and centurions taking multiple company command squads

* Fix missing armor for aquilon terminators (#3241)

* Fix Infantry Alias

* Cleanup Cult Arcana Discipline Duplicate Conditions

---------

Co-authored-by: William Pitt <william.pitt@hotmail.com>
Co-authored-by: Noah Stephen Haskell <nstephenh@gmail.com>
Co-authored-by: Ean Lombardo <scienceman91@gmail.com>
---
 2022 - Horus Heresy.gst            | 66 +++++++++++++++-----
 2022 - LA - Alpha Legion.cat       | 10 ++-
 2022 - LA - Blood Angels.cat       |  4 +-
 2022 - LA - Dark Angels.cat        |  4 +-
 2022 - LA - Death Guard.cat        |  4 +-
 2022 - LA - Emperor's Children.cat |  4 +-
 2022 - LA - Imperial Fists.cat     |  4 +-
 2022 - LA - Iron Hands.cat         |  4 +-
 2022 - LA - Iron Warriors.cat      |  4 +-
 2022 - LA - Night Lords.cat        |  4 +-
 2022 - LA - Raven Guard.cat        |  4 +-
 2022 - LA - Salamanders.cat        |  4 +-
 2022 - LA - Sons of Horus.cat      | 18 +++++-
 2022 - LA - Space Wolves.cat       |  4 +-
 2022 - LA - Thousand Sons.cat      |  4 +-
 2022 - LA - Ultramarines.cat       |  4 +-
 2022 - LA - White Scars.cat        |  7 +--
 2022 - LA - Word Bearers.cat       |  4 +-
 2022 - LA - World Eaters.cat       |  4 +-
 2022 - LI - Custodes.cat           | 11 +++-
 2022 - LI - Solar Auxilia.cat      |  4 +-
 2022 - Legiones Astartes.cat       | 98 ++++++++++++++----------------
 22 files changed, 162 insertions(+), 112 deletions(-)

diff --git a/2022 - Horus Heresy.gst b/2022 - Horus Heresy.gst
index 52c9a3ba..1c733e3e 100644
--- a/2022 - Horus Heresy.gst	
+++ b/2022 - Horus Heresy.gst	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem xmlns="http://www.battlescribe.net/schema/gameSystemSchema" id="28d4-bd2e-4858-ece6" name="Horus Heresy (2022)" revision="107" battleScribeVersion="2.03" type="gameSystem">
+<gameSystem xmlns="http://www.battlescribe.net/schema/gameSystemSchema" id="28d4-bd2e-4858-ece6" name="Horus Heresy (2022)" revision="108" battleScribeVersion="2.03" type="gameSystem">
   <publications>
     <publication name="Github" hidden="false" id="e2a4-ac85-1bef-22f5" publisherUrl="https://github.com/BSData/horus-heresy" shortName="BSData/horus-heresy"/>
     <publication id="e77a-823a-da94-16b9" name="Warhammer: The Horus Heresy - Age of Darkness Rulebook" shortName="Main Rules" publicationDate="June 2022"/>
@@ -246,9 +246,7 @@ During Reactions made in any Phase, a unit equipped with Jump PAcks may not acti
           <description>All models with both the Infantry Unit Type and the Legiones Astartes (Salamanders) in a Detachment using this Rite of War ignore all modifiers to their Leadership when making Pinning tests.</description>
         </rule>
         <rule name="Infantry Unit Type" hidden="false" id="ed36-77cb-5da7-3298" publicationId="e77a-823a-da94-16b9" page="195">
-          <alias>
-            <undefined>Infantry</undefined>
-          </alias>
+          <alias>Infantry</alias>
           <description>An Infantry unit may only include or be joined by models of the Infantry or Primarch Unit Type, unless a special rule states otherwise.</description>
         </rule>
       </rules>
@@ -265,18 +263,30 @@ During Reactions made in any Phase, a unit equipped with Jump PAcks may not acti
         <infoLink id="9725-2d0a-cb56-757b" name="Kharash" hidden="false" targetId="71fa-da0d-0056-9072" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
-              <conditions>
-                <condition type="equalTo" value="0" field="selections" scope="force" childId="a2cf-c464-bfdd-4467" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="equalTo" value="0" field="selections" scope="force" childId="a2cf-c464-bfdd-4467" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="23a4-cb25-4fc5-5c3c" shared="true"/>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="2b7a-a60d-fbc4-7000" shared="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
           </modifiers>
         </infoLink>
         <infoLink id="e106-2c9c-ca77-e0da" name="Feel No Pain (X)" hidden="false" targetId="ec46-ff29-32e0-c2aa" type="rule">
           <modifiers>
             <modifier type="set" field="hidden" value="true">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a2cf-c464-bfdd-4467" type="equalTo"/>
-              </conditions>
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="equalTo" value="0" field="selections" scope="force" childId="a2cf-c464-bfdd-4467" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="23a4-cb25-4fc5-5c3c" shared="true"/>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="2b7a-a60d-fbc4-7000" shared="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
             <modifier type="set" field="name" value="Feel No Pain (5+)"/>
           </modifiers>
@@ -1368,6 +1378,7 @@ If a Skimmer is Immobilised or Wrecked, its base is removed, if possible. If thi
     <categoryEntry name="Salamanders - Crusade Detachment" id="928c-8689-59e8-c1e1" hidden="false"/>
     <categoryEntry name="Raven Guard - Crusade Detachment" id="afca-a57f-a32c-59fd" hidden="false"/>
     <categoryEntry name="Alpha Legion - Crusade Detachment" id="c929-73a2-9fc4-5472" hidden="false"/>
+    <categoryEntry name="Fortification Unit Type" id="679d-ec21-2940-fb9" hidden="false"/>
   </categoryEntries>
   <forceEntries>
     <forceEntry id="d926-652f-8436-30ce" name="1. Crusade Force Organisation Chart" hidden="false">
@@ -2493,6 +2504,8 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="d7ec-95a3-173d-ca65" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="c8d1-6d92-9f5e-ce1d" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="9f1e-fbf0-3032-32fe" id="1626-7198-7dce-6d47" primary="false" name="Building Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="7488-dcd5-3230-57d7" name="Imperial Bunker" hidden="false" collective="false" import="true" targetId="5157-f309-77f9-1256" type="selectionEntry">
@@ -2525,6 +2538,8 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="38c2-9688-ede4-f626" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="416e-c595-4e08-fa20" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="9f1e-fbf0-3032-32fe" id="527-4d85-8d7f-a94e" primary="false" name="Building Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="427d-eb8e-dbbd-87a2" name="Defence Line" hidden="false" collective="false" import="true" targetId="ea91-0572-393c-e925" type="selectionEntry">
@@ -2557,6 +2572,8 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="86ff-083e-ce6d-8284" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="8480-9a13-2b15-66b2" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="473d-0126-2dab-25ea" id="4b05-a1a3-6aff-d546" primary="false" name="Barricade Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="ad63-7783-8500-e19f" name="Allied Detachment" hidden="false" collective="false" import="true" targetId="0fc8-91be-dcf4-1513" type="selectionEntry">
@@ -2595,6 +2612,8 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="247f-4a75-ac5d-c4f7" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="bc83-7d16-67fd-838b" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="9f1e-fbf0-3032-32fe" id="f881-e1ea-9195-e5d5" primary="false" name="Building Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="c3fd-09fe-2ac7-2183" name="Vengeance Weapon Battery" hidden="false" collective="false" import="true" targetId="8e99-19e1-b84a-db0b" type="selectionEntry">
@@ -2628,6 +2647,8 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="7836-9c5f-7d2f-9e26" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="1501-d422-9da1-def1" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="3eeb-b4b8-3d85-245a" id="170d-e1aa-9d81-5518" primary="false" name="Emplacement Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="f1d1-ca61-ae6b-4d33" name="Void Shield Generator" hidden="false" collective="false" import="true" targetId="fa45-1d74-9584-5bd5" type="selectionEntry">
@@ -2661,6 +2682,8 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="b9bf-59ce-321a-3bea" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="f491-63a2-3f9e-6b33" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="3eeb-b4b8-3d85-245a" id="16d0-4da3-d963-f7b0" primary="false" name="Emplacement Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="026e-1405-50cc-e19b" name="Skyshield Landing Pad" hidden="false" collective="false" import="true" targetId="a7fa-db40-52ee-b359" type="selectionEntry">
@@ -2694,6 +2717,8 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="5967-6a4c-46fd-c33e" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="c58d-ceb5-90f2-f589" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="3eeb-b4b8-3d85-245a" id="b9bb-b30b-7fc7-36ff" primary="false" name="Emplacement Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="dd67-c6ce-04e4-8dc2" name="Fortress Of Redemption" hidden="false" collective="false" import="true" targetId="6392-ce9d-29a7-1851" type="selectionEntry">
@@ -2727,6 +2752,7 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="b9eb-0b8e-0c45-463c" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="cdbd-1c19-410-7f80" primary="false" name="Fortification Unit Type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="d8a1-2527-d538-bdfb" name="Aquila Strongpoint" hidden="false" collective="false" import="true" targetId="e13d-9ef8-9b0d-bc22" type="selectionEntry">
@@ -2760,6 +2786,9 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="152d-1e4a-20aa-b580" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="6ca2-0ab3-212d-7c76" id="592-f927-d2ae-6e28" primary="false" name="Massive Sub-type"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="83e1-cb08-777e-1d7" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="9f1e-fbf0-3032-32fe" id="348e-b71b-598f-582a" primary="false" name="Building Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="01dc-d34a-1988-3919" name="Primus Redoubt" hidden="false" collective="false" import="true" targetId="2d87-bde8-08d5-ae82" type="selectionEntry">
@@ -2793,6 +2822,9 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="d079-b62e-6190-edac" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="679d-ec21-2940-fb9" id="33c3-6f30-ffe5-86af" primary="false" name="Fortification Unit Type"/>
+        <categoryLink targetId="6ca2-0ab3-212d-7c76" id="a73d-63f5-b00f-918" primary="false" name="Massive Sub-type"/>
+        <categoryLink targetId="9f1e-fbf0-3032-32fe" id="c5eb-9e38-4cfc-1f48" primary="false" name="Building Sub-type"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="91a3-bce0-aa49-e830" name="Hammerfall Bunker" hidden="false" collective="false" import="true" targetId="d5f5-a83b-ed8e-61c0" type="selectionEntry">
@@ -2826,6 +2858,8 @@ THIS IS A TEMPORARY NOTIFICATION THAT WILL BE REMOVED IN A FEW MONTHS WHEN HOPEF
       </modifiers>
       <categoryLinks>
         <categoryLink id="eec3-bfaa-9984-36f1" name="Fortification:" hidden="false" targetId="a24f-12d8-36c1-f477" primary="true"/>
+        <categoryLink targetId="9f1e-fbf0-3032-32fe" id="fd14-fe07-a8d1-6de3" primary="false" name="Building Sub-type"/>
+        <categoryLink targetId="3eeb-b4b8-3d85-245a" id="3e79-3259-21e-6162" primary="false" name="Emplacement Sub-type"/>
       </categoryLinks>
     </entryLink>
   </entryLinks>
@@ -6672,7 +6706,7 @@ Fire Point (Front 4)</characteristic>
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="55"/>
           </costs>
           <categoryLinks>
-            <categoryLink targetId="a24f-12d8-36c1-f477" id="2341-d478-43ea-8a68" name="Fortification:" primary="false"/>
+            <categoryLink name="Fortification Unit Type" hidden="false" id="3533-9f5c-bd25-4e47" targetId="679d-ec21-2940-fb9" primary="false"/>
           </categoryLinks>
         </selectionEntry>
       </selectionEntries>
@@ -6712,7 +6746,7 @@ Hull Mounted (Rear) Heavy Bolter</characteristic>
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="85"/>
           </costs>
           <categoryLinks>
-            <categoryLink targetId="a24f-12d8-36c1-f477" id="0229-61ff-4de5-aff5" name="Fortification:" primary="false"/>
+            <categoryLink name="Fortification Unit Type" hidden="false" id="62c1-9a51-5292-25da" targetId="679d-ec21-2940-fb9" primary="false"/>
           </categoryLinks>
         </selectionEntry>
       </selectionEntries>
@@ -8840,7 +8874,7 @@ Hull Mounted (Rear) Heavy Bolter</characteristic>
           </costs>
           <categoryLinks>
             <categoryLink targetId="3eeb-b4b8-3d85-245a" id="43c1-7dc4-4f66-b763" name="Emplacement Sub-type" primary="false"/>
-            <categoryLink targetId="a24f-12d8-36c1-f477" id="9d80-388a-4821-a812" name="Fortification:" primary="false"/>
+            <categoryLink name="Fortification Unit Type" hidden="false" id="3899-bbe5-19f1-5cfd" targetId="679d-ec21-2940-fb9" primary="false"/>
           </categoryLinks>
         </selectionEntry>
       </selectionEntries>
@@ -9066,7 +9100,7 @@ Hull Mounted (Rear) Mounted Twin-linked Heavy Bolter or Heavy Flamers</character
           </costs>
           <categoryLinks>
             <categoryLink targetId="3eeb-b4b8-3d85-245a" id="076b-78d8-46ba-a6ed" name="Emplacement Sub-type" primary="false"/>
-            <categoryLink targetId="a24f-12d8-36c1-f477" id="6f4f-e264-4412-af4d" name="Fortification:" primary="false"/>
+            <categoryLink targetId="679d-ec21-2940-fb9" id="ff21-8f-9488-c8e4" primary="false" name="Fortification Unit Type"/>
           </categoryLinks>
         </selectionEntry>
         <selectionEntry id="1332-1487-ac2c-3921" name="Bunker Annex" hidden="false" collective="false" import="true" type="model">
@@ -9124,7 +9158,7 @@ Hull Mounted (Rear) Mounted Twin-linked Heavy Bolter or Heavy Flamers</character
           </costs>
           <categoryLinks>
             <categoryLink targetId="9f1e-fbf0-3032-32fe" id="8af4-11d7-46c2-b6c4" name="Building Sub-type" primary="false"/>
-            <categoryLink targetId="a24f-12d8-36c1-f477" id="d87b-579e-4808-a9de" name="Fortification:" primary="false"/>
+            <categoryLink targetId="679d-ec21-2940-fb9" id="ce85-859-511c-70d4" primary="false" name="Fortification Unit Type"/>
           </categoryLinks>
         </selectionEntry>
       </selectionEntries>
@@ -15838,7 +15872,7 @@ applied to models without the Character Unit sub-type).</description>
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="ffe9-7e78-e4cd-7967" includeChildSelections="false"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup name="Character Stat Improvement" id="5e99-fcf2-6b64-e88e" hidden="false" flatten="false">
+            <selectionEntryGroup name="Character Stat Improvement" id="5e99-fcf2-6b64-e88e" hidden="true" flatten="false">
               <selectionEntries>
                 <selectionEntry type="upgrade" import="true" name="+1 WS" hidden="false" id="c60d-d862-a0b-9909" sortIndex="1">
                   <constraints>
diff --git a/2022 - LA - Alpha Legion.cat b/2022 - LA - Alpha Legion.cat
index 39f1db6c..5fd43111 100644
--- a/2022 - LA - Alpha Legion.cat	
+++ b/2022 - LA - Alpha Legion.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="9c06-1c61-d01d-8445" name="LA - XX: Alpha Legion" revision="52" battleScribeVersion="2.03" authorName="Alphalas" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="9c06-1c61-d01d-8445" name="LA - XX: Alpha Legion" revision="53" battleScribeVersion="2.03" authorName="Alphalas" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
   <categoryEntries>
     <categoryEntry id="2275-5253-2421-7383" name="Rewards of Trechery" hidden="false">
       <modifiers>
@@ -121,7 +121,8 @@
       </modifiers>
       <categoryLinks>
         <categoryLink id="b56c-b87b-07a2-6437" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
-        <categoryLink name="Primarch:" hidden="false" id="290c-4c15-3100-699b" targetId="e031-3c2-e3f8-d40a" primary="false"/>
+        <categoryLink name="Primarch:" hidden="false" id="290c-4c15-3100-699b" targetId="e031-3c2-e3f8-d40a" primary="true"/>
+        <categoryLink targetId="ad5f-31db-8bc7-5c46" id="9b5d-414c-a811-34fa" primary="false" name="Primarch Unit Type"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="4c84-ff78-6653-f033" name="Retinue" hidden="false" collective="false" import="true" targetId="09f9-933c-a88e-6e38" type="selectionEntryGroup">
@@ -5370,10 +5371,13 @@
         <categoryLink id="81e6-ef94-ef5f-864d" name="Troops:" hidden="false" targetId="9b5d-fac7-799b-d7e7" primary="true"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="5eed-a877-c114-115" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="5eed-a877-c114-115" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="c24a-f56e-304f-d620" type="selectionEntryGroup" targetId="a1f6-6ccd-6b3e-aba2"/>
       </entryLinks>
+      <categoryLinks>
+        <categoryLink targetId="4f85-eb33-30c9-8f51" id="6690-9289-fcb9-bc5e" primary="true" name="HQ:"/>
+      </categoryLinks>
     </entryLink>
   </entryLinks>
   <sharedSelectionEntries>
diff --git a/2022 - LA - Blood Angels.cat b/2022 - LA - Blood Angels.cat
index dc4587fc..b7611418 100644
--- a/2022 - LA - Blood Angels.cat	
+++ b/2022 - LA - Blood Angels.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="cd4d-8765-5387-8409" name="LA -  IX: Blood Angels" revision="44" battleScribeVersion="2.03" authorName="Jon K &quot;Alphalas&quot;" authorContact="Twitter: Alphalas_ Discord: Alphalas#8789" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="cd4d-8765-5387-8409" name="LA -  IX: Blood Angels" revision="45" battleScribeVersion="2.03" authorName="Jon K &quot;Alphalas&quot;" authorContact="Twitter: Alphalas_ Discord: Alphalas#8789" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="1900-3f09-f47b-bed2" name="Praetor" hidden="false" collective="false" import="false" targetId="03be-5d55-d05a-771d" type="selectionEntry">
       <comment>template_id_5798-3fc7-4d4c-ad41</comment>
@@ -3054,7 +3054,7 @@
         <categoryLink id="b24f-9fff-a577-46c8" name="HQ:" hidden="false" targetId="4f85-eb33-30c9-8f51" primary="true"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="e689-67e7-8ed7-66ec" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="e689-67e7-8ed7-66ec" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="a25-d93d-e663-37bf" type="selectionEntryGroup" targetId="4f09-6be3-276d-2756"/>
       </entryLinks>
diff --git a/2022 - LA - Dark Angels.cat b/2022 - LA - Dark Angels.cat
index 9e9c7885..8ea11273 100644
--- a/2022 - LA - Dark Angels.cat	
+++ b/2022 - LA - Dark Angels.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ee5e-198e-1b19-4b9f" name="LA -   I: Dark Angels" revision="35" battleScribeVersion="2.03" authorName="revivedtitan" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="72" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ee5e-198e-1b19-4b9f" name="LA -   I: Dark Angels" revision="36" battleScribeVersion="2.03" authorName="revivedtitan" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="72" type="catalogue">
   <entryLinks>
     <entryLink id="7653-8041-8d1c-c872" name="Dreadwing Interemptor Squad" hidden="false" collective="false" import="false" targetId="3008-e8ed-9e97-71c9" type="selectionEntry">
       <categoryLinks>
@@ -2912,7 +2912,7 @@
         <categoryLink id="8411-1862-5232-cf37" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="6694-2ce3-9bb0-15a6" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="6694-2ce3-9bb0-15a6" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="43e7-5a73-554e-59b8" type="selectionEntryGroup" targetId="bb85-3277-2090-6576"/>
       </entryLinks>
diff --git a/2022 - LA - Death Guard.cat b/2022 - LA - Death Guard.cat
index f8634f79..5b40f005 100644
--- a/2022 - LA - Death Guard.cat	
+++ b/2022 - LA - Death Guard.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="d228-55e8-b58c-1b77" name="LA -  XIV: Death Guard" revision="34" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="d228-55e8-b58c-1b77" name="LA -  XIV: Death Guard" revision="35" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="fb89-32c1-bdc5-2e3d" name="Mortarion" hidden="false" collective="false" import="false" targetId="7427-bdfa-c359-ebb8" type="selectionEntry">
       <modifiers>
@@ -3022,7 +3022,7 @@
         <categoryLink id="b46c-1d2f-ed16-4065" name="Troops:" hidden="false" targetId="9b5d-fac7-799b-d7e7" primary="true"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="a46b-8de8-db-18fd" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="a46b-8de8-db-18fd" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="3585-6180-b915-975b" type="selectionEntryGroup" targetId="7f03-6720-21ba-0d7b"/>
       </entryLinks>
diff --git a/2022 - LA - Emperor's Children.cat b/2022 - LA - Emperor's Children.cat
index 34cda410..01b176fd 100644
--- a/2022 - LA - Emperor's Children.cat	
+++ b/2022 - LA - Emperor's Children.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="72ba-61c2-37ad-c785" name="LA -   III: Emperor&apos;s Children" revision="40" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="72ba-61c2-37ad-c785" name="LA -   III: Emperor&apos;s Children" revision="41" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="a119-3943-4b8b-b651" name="Captain Lucius" hidden="true" collective="false" import="false" targetId="0707-1e4b-27da-9cd4" type="selectionEntry">
       <modifiers>
@@ -3081,7 +3081,7 @@
         <constraint type="min" value="0" field="selections" scope="parent" shared="true" id="1d94-cef1-ee56-8a19"/>
       </constraints>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="341a-389e-9d13-e66d" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="341a-389e-9d13-e66d" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="5a78-4ff0-d90c-7645" type="selectionEntryGroup" targetId="0cb4-896e-a455-243b"/>
       </entryLinks>
diff --git a/2022 - LA - Imperial Fists.cat b/2022 - LA - Imperial Fists.cat
index 0cbd9f93..21c12faf 100644
--- a/2022 - LA - Imperial Fists.cat	
+++ b/2022 - LA - Imperial Fists.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="8866-00ec-715f-f21a" name="LA -   VII: Imperial Fists" revision="35" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="8866-00ec-715f-f21a" name="LA -   VII: Imperial Fists" revision="36" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="b3e4-1487-4ab7-7515" name="Alexis Polux" hidden="false" collective="false" import="false" targetId="9229-b4f9-2213-9672" type="selectionEntry">
       <modifiers>
@@ -3778,7 +3778,7 @@
         <entryLink id="2281-dab9-2cfc-e097" name="Retinue" hidden="false" collective="false" import="true" targetId="446f-102e-289b-bdc5" type="selectionEntryGroup"/>
       </entryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="cee6-df45-d2fc-2821" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="cee6-df45-d2fc-2821" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="82b5-9627-9e16-806f" type="selectionEntryGroup" targetId="164e-db98-d506-d2d9"/>
       </entryLinks>
diff --git a/2022 - LA - Iron Hands.cat b/2022 - LA - Iron Hands.cat
index cd490c57..7c2dced4 100644
--- a/2022 - LA - Iron Hands.cat	
+++ b/2022 - LA - Iron Hands.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="b73e-125f-db29-17f2" name="LA -  X: Iron Hands" revision="41" battleScribeVersion="2.03" authorName="Figjam Bohica" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="b73e-125f-db29-17f2" name="LA -  X: Iron Hands" revision="42" battleScribeVersion="2.03" authorName="Figjam Bohica" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="6107-168e-198e-2e94" name="X: Iron Hands" hidden="false" collective="false" import="false" targetId="bfc9-c99c-bf8a-3917" type="selectionEntry">
       <modifiers>
@@ -3001,7 +3001,7 @@
         <categoryLink id="4eec-ea3e-f3b0-35e0" name="Compulsory HQ:" hidden="false" targetId="f823-8c1d-6a87-26a1" primary="false"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="fee2-ae5f-94b9-3d29" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="fee2-ae5f-94b9-3d29" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="2f13-a607-c8e3-d655" type="selectionEntryGroup" targetId="4dfa-3ccc-df19-6789"/>
       </entryLinks>
diff --git a/2022 - LA - Iron Warriors.cat b/2022 - LA - Iron Warriors.cat
index a4c9d0ff..d16c5aec 100644
--- a/2022 - LA - Iron Warriors.cat	
+++ b/2022 - LA - Iron Warriors.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="2ee4-57ed-db44-8a63" name="LA -   IV: Iron Warriors" revision="40" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="2ee4-57ed-db44-8a63" name="LA -   IV: Iron Warriors" revision="41" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="fe10-3104-0252-96de" name="Nârik Dreygur" hidden="true" collective="false" import="false" targetId="ac97-c8ce-16ba-9c49" type="selectionEntry">
       <modifiers>
@@ -3040,7 +3040,7 @@
         <categoryLink id="1d53-f359-bf3c-be70" name="Troops:" hidden="false" targetId="9b5d-fac7-799b-d7e7" primary="true"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="4c49-acb3-cfe8-f40" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="4c49-acb3-cfe8-f40" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="caca-5f17-8f37-84c4" type="selectionEntryGroup" targetId="3447-379d-6e6b-6794"/>
       </entryLinks>
diff --git a/2022 - LA - Night Lords.cat b/2022 - LA - Night Lords.cat
index b5fdc353..9d2d2271 100644
--- a/2022 - LA - Night Lords.cat	
+++ b/2022 - LA - Night Lords.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="36dc-14fc-8872-476b" name="LA -   VIII: Night Lords" revision="41" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="36dc-14fc-8872-476b" name="LA -   VIII: Night Lords" revision="42" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
   <entryLinks>
     <entryLink id="f491-c7fa-f6d3-917d" name="Contekar Terminator Squad" hidden="false" collective="false" import="false" targetId="837e-c3ca-437e-dfbf" type="selectionEntry">
       <modifiers>
@@ -3187,7 +3187,7 @@
         </categoryLink>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="7c70-8825-dc55-2200" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="7c70-8825-dc55-2200" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="1c90-ff93-dc42-837c" type="selectionEntryGroup" targetId="7923-f342-c07f-4967"/>
       </entryLinks>
diff --git a/2022 - LA - Raven Guard.cat b/2022 - LA - Raven Guard.cat
index 9e55dbfa..2c4542b8 100644
--- a/2022 - LA - Raven Guard.cat	
+++ b/2022 - LA - Raven Guard.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="d21e-9c80-a7f8-728c" name="LA - XIX: Raven Guard" revision="31" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="d21e-9c80-a7f8-728c" name="LA - XIX: Raven Guard" revision="32" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="84cc-e59c-174e-fb25" name="Mor Deythan Squad" hidden="false" collective="false" import="false" targetId="c268-08ac-5b90-d034" type="selectionEntry">
       <categoryLinks>
@@ -2965,7 +2965,7 @@
         <categoryLink id="e6db-eeb9-37c4-fa62" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="a926-bd33-e87b-ba38" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="a926-bd33-e87b-ba38" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="8706-50f8-65c4-bd19" type="selectionEntryGroup" targetId="40ca-b143-a04e-4083"/>
       </entryLinks>
diff --git a/2022 - LA - Salamanders.cat b/2022 - LA - Salamanders.cat
index d44ccd1f..2e867589 100644
--- a/2022 - LA - Salamanders.cat	
+++ b/2022 - LA - Salamanders.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="3547-84d8-d789-bab7" name="LA -  XVIII: Salamanders" revision="39" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="72" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="3547-84d8-d789-bab7" name="LA -  XVIII: Salamanders" revision="40" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="72" type="catalogue">
   <entryLinks>
     <entryLink id="93d2-b1cb-b684-a9b3" name="XVIII: Salamanders" hidden="false" collective="false" import="false" targetId="c805-ca3a-ff93-5e2f" type="selectionEntry">
       <modifiers>
@@ -3340,7 +3340,7 @@
         <categoryLink targetId="36c3-e85e-97cc-c503" id="9227-be8a-da76-7573" primary="false" name="Unit:"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="d383-3903-5420-7ad4" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="d383-3903-5420-7ad4" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="b2a0-9c60-a4f1-2839" type="selectionEntryGroup" targetId="4ef8-ecc8-b821-c604"/>
       </entryLinks>
diff --git a/2022 - LA - Sons of Horus.cat b/2022 - LA - Sons of Horus.cat
index 4eafa122..abb92797 100644
--- a/2022 - LA - Sons of Horus.cat	
+++ b/2022 - LA - Sons of Horus.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="62c7-42f4-5523-af1b" name="LA -  XVI: Sons of Horus" revision="38" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="62c7-42f4-5523-af1b" name="LA -  XVI: Sons of Horus" revision="39" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="c2a2-9b6d-b384-3f43" name="XVI: Sons of Horus" hidden="false" collective="false" import="false" targetId="01b4-57c7-bf61-2abf" type="selectionEntry">
       <modifiers>
@@ -3114,8 +3114,20 @@
         <categoryLink id="dd19-c149-942f-a5b3" name="Compulsory HQ:" hidden="false" targetId="f823-8c1d-6a87-26a1" primary="false"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Horus Aximand" hidden="false" id="cf96-20ed-cd69-347c" targetId="7ed0-7d06-406c-abd9" type="selectionEntry"/>
-    <entryLink import="true" name="Optae" hidden="false" id="6a69-8d61-9c0b-5a04" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Horus Aximand" hidden="false" id="cf96-20ed-cd69-347c" targetId="7ed0-7d06-406c-abd9" type="selectionEntry">
+      <modifiers>
+        <modifier type="set" value="true" field="hidden">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="equalTo" value="0" field="selections" scope="force" childId="f9c0-0c5a-3e24-58c7" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
+      </modifiers>
+    </entryLink>
+    <entryLink import="false" name="Optae" hidden="false" id="6a69-8d61-9c0b-5a04" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="4778-5c41-1661-93cc" type="selectionEntryGroup" targetId="9c74-1002-8103-2848"/>
       </entryLinks>
diff --git a/2022 - LA - Space Wolves.cat b/2022 - LA - Space Wolves.cat
index cac523dc..eaa0c62d 100644
--- a/2022 - LA - Space Wolves.cat	
+++ b/2022 - LA - Space Wolves.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ca15-13de-89cb-bbb2" name="LA -   VI: Space Wolves" revision="35" battleScribeVersion="2.03" authorName="Mr_Dark, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ca15-13de-89cb-bbb2" name="LA -   VI: Space Wolves" revision="36" battleScribeVersion="2.03" authorName="Mr_Dark, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="ff53-69d9-ec0b-9caa" name="VI: Space Wolves" hidden="false" collective="false" import="false" targetId="4916-965e-8339-44f6" type="selectionEntry">
       <modifiers>
@@ -2998,7 +2998,7 @@
         <categoryLink id="e9d4-22cc-4d94-cde2" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="7b3-8d0a-404c-dea1" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="7b3-8d0a-404c-dea1" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="c765-9968-4b94-b547" type="selectionEntryGroup" targetId="4d59-1610-09c5-1991"/>
       </entryLinks>
diff --git a/2022 - LA - Thousand Sons.cat b/2022 - LA - Thousand Sons.cat
index f8e889da..7008fbf6 100644
--- a/2022 - LA - Thousand Sons.cat	
+++ b/2022 - LA - Thousand Sons.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="abac-8dd1-df65-e253" name="LA -  XV: Thousand Sons" revision="36" battleScribeVersion="2.03" authorName="Arkangelmark5" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="abac-8dd1-df65-e253" name="LA -  XV: Thousand Sons" revision="37" battleScribeVersion="2.03" authorName="Arkangelmark5" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <publications>
     <publication id="f743-7ff9-a2f3-01c7" name="Exemplary Battles of the Age of Darkness: The Axandria IV Incident" shortName="Axandria IV" publisher="Exemplary Battles of the Age of Darkness: The Axandria IV Incident" publicationDate="9/16/2022" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2022/09/3mVvZrTG9XOWeVxv.pdf"/>
   </publications>
@@ -3006,7 +3006,7 @@
         <categoryLink id="2a59-d380-e882-32a7" name="Troops:" hidden="false" targetId="9b5d-fac7-799b-d7e7" primary="true"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="8b8-f680-613e-1b1a" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="8b8-f680-613e-1b1a" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="b338-eaf7-a9dc-9459" type="selectionEntryGroup" targetId="631b-b029-0909-b8f6"/>
       </entryLinks>
diff --git a/2022 - LA - Ultramarines.cat b/2022 - LA - Ultramarines.cat
index ca0670dd..48b4b620 100644
--- a/2022 - LA - Ultramarines.cat	
+++ b/2022 - LA - Ultramarines.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="68ae-9855-b56a-95e6" name="LA -  XIII: Ultramarines" revision="41" battleScribeVersion="2.03" authorName="Mr_Dark, Alphalas, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="68ae-9855-b56a-95e6" name="LA -  XIII: Ultramarines" revision="42" battleScribeVersion="2.03" authorName="Mr_Dark, Alphalas, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="76b3-52d9-a195-2b31" name="XIII: Ultramarines" hidden="false" collective="false" import="false" targetId="8e0f-3552-8842-f281" type="selectionEntry">
       <modifiers>
@@ -2985,7 +2985,7 @@
         <categoryLink id="ebda-4b99-6483-d4f8" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="65fb-8b6a-c34f-12b2" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="65fb-8b6a-c34f-12b2" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="105d-7b7c-411a-7a6d" type="selectionEntryGroup" targetId="5e14-ad5c-00c3-8c3e"/>
       </entryLinks>
diff --git a/2022 - LA - White Scars.cat b/2022 - LA - White Scars.cat
index f8ca210e..c8e657dd 100644
--- a/2022 - LA - White Scars.cat	
+++ b/2022 - LA - White Scars.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="caa9-c50e-8eed-2259" name="LA -   V: White Scars" revision="40" battleScribeVersion="2.03" authorName="Mr_Dark, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="caa9-c50e-8eed-2259" name="LA -   V: White Scars" revision="41" battleScribeVersion="2.03" authorName="Mr_Dark, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="a738-6a11-dfe7-286c" name="V: White Scars" hidden="false" collective="false" import="false" targetId="e01e-5cdd-e512-8353" type="selectionEntry">
       <modifiers>
@@ -3279,7 +3279,7 @@
         </entryLink>
       </entryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="ba3d-9b03-cb24-5619" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="ba3d-9b03-cb24-5619" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="33e3-9984-2ce6-14c7" type="selectionEntryGroup" targetId="834b-fcb6-78e5-2099"/>
       </entryLinks>
@@ -5507,8 +5507,7 @@ In addition:
       </infoLinks>
       <rules>
         <rule name="The Shattered Vth" id="619e-585b-d5f3-fdb3" hidden="false" publicationId="d882-d2a-5da1-92c4" page="195">
-          <description>Once part of their wider Legions,the events of the Horus Heresy saw these warriors fighting among adhoc formations brought together by tragedy and fortitude in equal measure. You can include this model in a Shattered Legions Detachment that includes models representing the White Scars Legion. When you do so, replace this model&apos;s Legiones Astartes (White Scars) special rule with the Legiones Astartes (Shattered Legions) special rule. This is an exception to the normal rules for Legiones Astartes (Shattered Legions). When included in a Shattered Legions Detachment, this model must represent the White Scars Legion.
-</description>
+          <description>Once part of their wider Legions,the events of the Horus Heresy saw these warriors fighting among adhoc formations brought together by tragedy and fortitude in equal measure. You can include this model in a Shattered Legions Detachment that includes models representing the White Scars Legion. When you do so, replace this model&apos;s Legiones Astartes (White Scars) special rule with the Legiones Astartes (Shattered Legions) special rule. This is an exception to the normal rules for Legiones Astartes (Shattered Legions). When included in a Shattered Legions Detachment, this model must represent the White Scars Legion.</description>
         </rule>
       </rules>
     </selectionEntry>
diff --git a/2022 - LA - Word Bearers.cat b/2022 - LA - Word Bearers.cat
index 034c05b4..83623bce 100644
--- a/2022 - LA - Word Bearers.cat	
+++ b/2022 - LA - Word Bearers.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="1df7-bbbc-b70e-6a3f" name="LA -  XVII: Word Bearers" revision="37" battleScribeVersion="2.03" authorName="UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="1df7-bbbc-b70e-6a3f" name="LA -  XVII: Word Bearers" revision="38" battleScribeVersion="2.03" authorName="UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <categoryEntries>
     <categoryEntry id="821c-0c83-5ed0-ff6b" name="Harbinger of Chaos Restriction" hidden="false">
       <modifiers>
@@ -3367,7 +3367,7 @@
         </modifier>
       </modifiers>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="9c6b-d968-e349-c830" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="9c6b-d968-e349-c830" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="7c84-e5b5-79e9-c822" type="selectionEntryGroup" targetId="1ac0-fbef-d266-a924"/>
       </entryLinks>
diff --git a/2022 - LA - World Eaters.cat b/2022 - LA - World Eaters.cat
index e4776225..10617c76 100644
--- a/2022 - LA - World Eaters.cat	
+++ b/2022 - LA - World Eaters.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="d901-0eca-48b5-304a" name="LA -  XII: World Eaters" revision="40" battleScribeVersion="2.03" authorName="UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="72" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="d901-0eca-48b5-304a" name="LA -  XII: World Eaters" revision="41" battleScribeVersion="2.03" authorName="UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="72" type="catalogue">
   <entryLinks>
     <entryLink id="d647-fd99-73e0-bd57" name="Angron" hidden="false" collective="false" import="false" targetId="6352-8efa-0cc4-cfa7" type="selectionEntry">
       <modifiers>
@@ -3028,7 +3028,7 @@
         <categoryLink id="f0dc-4c8f-c31e-9bfb" name="Fast Attack:" hidden="false" targetId="20ef-cd01-a8da-376e" primary="true"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Optae" hidden="false" id="2bc0-4231-9e98-85e6" type="selectionEntry" targetId="5585-b5f3-4640-894b">
+    <entryLink import="false" name="Optae" hidden="false" id="2bc0-4231-9e98-85e6" type="selectionEntry" targetId="5585-b5f3-4640-894b">
       <entryLinks>
         <entryLink import="true" name="Warlord Traits" hidden="false" id="192d-17d6-b5f1-90d" type="selectionEntryGroup" targetId="156e-4434-2c39-2fef"/>
       </entryLinks>
diff --git a/2022 - LI - Custodes.cat b/2022 - LI - Custodes.cat
index f09d111d..0ecec3a5 100644
--- a/2022 - LI - Custodes.cat	
+++ b/2022 - LI - Custodes.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="2f2b-1f31-c455-1701" name="LI - Custodes" revision="21" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="2f2b-1f31-c455-1701" name="LI - Custodes" revision="22" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
   <categoryEntries>
     <categoryEntry id="ccca-a9de-0cd9-f8be" name="Legio Custodes" hidden="false">
       <infoLinks>
@@ -27,7 +27,8 @@
     <entryLink id="1595-7192-9e5e-26a9" name="Constantin Valdor" hidden="false" collective="false" import="false" targetId="2e44-7b4f-37dd-05f4" type="selectionEntry">
       <categoryLinks>
         <categoryLink id="17f6-6098-0dbf-e27c" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
-        <categoryLink id="13c9-8366-95ab-62ab" name="Primarch Unit Type" hidden="false" targetId="ad5f-31db-8bc7-5c46" primary="true"/>
+        <categoryLink id="13c9-8366-95ab-62ab" name="Primarch Unit Type" hidden="false" targetId="ad5f-31db-8bc7-5c46" primary="false"/>
+        <categoryLink targetId="e031-3c2-e3f8-d40a" id="8f76-2526-f4d1-f7c2" primary="true" name="Primarch:"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="d518-801b-fe9a-03f8" name="Custodes Tribune" hidden="false" collective="false" import="false" targetId="d485-7848-0118-2dc3" type="selectionEntry">
@@ -1189,6 +1190,12 @@
             </modifier>
           </modifiers>
         </entryLink>
+        <entryLink import="true" name="Aquilon Pattern Terminator Armour" hidden="false" id="529f-4c58-af34-bd01" type="selectionEntry" targetId="b077-e64b-5a66-7ed2">
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="8df8-3a7d-e0ed-72ec" includeChildSelections="false"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="dcb0-e8b3-93bb-25b5" includeChildSelections="false"/>
+          </constraints>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="20"/>
diff --git a/2022 - LI - Solar Auxilia.cat b/2022 - LI - Solar Auxilia.cat
index fa2a0c8f..b0f91ad5 100644
--- a/2022 - LI - Solar Auxilia.cat	
+++ b/2022 - LI - Solar Auxilia.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="6af7-3fee-5bc1-7533" name="LI - Solar Auxilia" revision="36" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="6af7-3fee-5bc1-7533" name="LI - Solar Auxilia" revision="37" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
   <categoryEntries>
     <categoryEntry id="19f3-8727-02db-3ce5" name="Static Artillery" hidden="false">
       <rules>
@@ -11763,7 +11763,7 @@ If a Weapon Destroyed result is repaired, that weapon may not be used to attack
           <modifiers>
             <modifier type="set" value="5" field="afdb-a5d1-437b-9b12">
               <conditions>
-                <condition type="equalTo" value="1" field="selections" scope="force" childId="7e09-aae1-d5ff-d43e" shared="true"/>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="7e09-aae1-d5ff-d43e" shared="true" includeChildSelections="true"/>
               </conditions>
             </modifier>
           </modifiers>
diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
index 63fae9cf..ef00d2e3 100644
--- a/2022 - Legiones Astartes.cat	
+++ b/2022 - Legiones Astartes.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="6393-649c-7213-a327" name="Legions Astartes" revision="183" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="6393-649c-7213-a327" name="Legions Astartes" revision="184" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" type="catalogue">
   <publications>
     <publication id="0594-a9b0-6f10-090e" name="Legion Javelin Squadron update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/hd7WOnm2lKCHkskG.pdf"/>
     <publication id="acdb-27b7-6b7e-932f" name="Legion Mastodon update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/AopGHpxowuowkwJw.pdf"/>
@@ -4810,7 +4810,7 @@ When a model has two Raven’s Talons, that model gains +2 Attacks instead of th
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="92-bdc8-333c-4e27" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="92-bdc8-333c-4e27" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -7230,7 +7230,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="d88b-ebae-343d-ab0b" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="d88b-ebae-343d-ab0b" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -8614,7 +8614,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="45"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="b30c-f2c7-4600-72c" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="b30c-f2c7-4600-72c" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -12790,15 +12790,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                     </modifier>
                   </modifiers>
                 </entryLink>
-                <entryLink id="2aa6-ed38-ddc9-60fa" name="Cult Arcana Discipline" hidden="true" collective="false" import="true" targetId="d25a-f9ee-4a45-916e" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="set" field="hidden" value="false">
-                      <conditions>
-                        <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="21c3-2f28-7820-e51a" type="equalTo"/>
-                      </conditions>
-                    </modifier>
-                  </modifiers>
-                </entryLink>
+                <entryLink id="2aa6-ed38-ddc9-60fa" name="Cult Arcana Discipline" hidden="true" collective="false" import="true" targetId="d25a-f9ee-4a45-916e" type="selectionEntry"/>
                 <entryLink id="fa9b-23fa-ab59-4853" name="Warsmith" hidden="false" collective="false" import="true" targetId="cb35-21a5-c296-ddd9" type="selectionEntry"/>
                 <entryLink id="8242-426d-847c-f859" name="Argyrum-pattern Boarding Shield" hidden="false" collective="false" import="true" targetId="f670-7544-e4f3-f5fa" type="selectionEntry">
                   <constraints>
@@ -13493,15 +13485,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                     </modifier>
                   </modifiers>
                 </entryLink>
-                <entryLink id="b9d1-005a-edcb-2ce8" name="Cult Arcana Discipline" hidden="true" collective="false" import="true" targetId="d25a-f9ee-4a45-916e" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="set" field="hidden" value="false">
-                      <conditions>
-                        <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="21c3-2f28-7820-e51a" type="equalTo"/>
-                      </conditions>
-                    </modifier>
-                  </modifiers>
-                </entryLink>
+                <entryLink id="b9d1-005a-edcb-2ce8" name="Cult Arcana Discipline" hidden="true" collective="false" import="true" targetId="d25a-f9ee-4a45-916e" type="selectionEntry"/>
                 <entryLink id="b946-fbdd-acd1-467d" name="Warsmith" hidden="true" collective="false" import="true" targetId="cb35-21a5-c296-ddd9" type="selectionEntry"/>
                 <entryLink id="aff1-8ab6-d2d9-7815" name="Argyrum-pattern Boarding Shield" hidden="false" collective="false" import="true" targetId="f670-7544-e4f3-f5fa" type="selectionEntry">
                   <constraints>
@@ -14297,9 +14281,14 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
     <selectionEntry id="25a2-7a52-632a-6b2c" name="Centurion" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
         <modifier type="set" field="7e1a-0f0a-6d7f-1f19" value="1">
-          <conditions>
-            <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="373b-ce5a-ddc5-cf8f" type="equalTo"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="373b-ce5a-ddc5-cf8f" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="e6ec-f3e6-760c-f9bb" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
         <modifier type="remove" value="11f2-472f-c1d1-9ae9" field="category">
           <conditionGroups>
@@ -16404,6 +16393,9 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
               </conditions>
             </modifier>
           </modifiers>
+          <constraints>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="5eb9-13b6-4007-a544" includeChildSelections="false"/>
+          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -16782,7 +16774,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                   </costs>
                 </entryLink>
                 <entryLink id="e22f-8171-3d53-dd17" name="Terminator Lightning Claws" hidden="false" collective="false" import="true" targetId="eeb8-0216-3d95-f0da" type="selectionEntryGroup"/>
-                <entryLink import="true" name="Character Stat Improvement" hidden="true" id="842-a910-b379-7c8d" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+                <entryLink import="true" name="Character Stat Improvement" hidden="false" id="842-a910-b379-7c8d" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
                       <conditions>
@@ -17028,7 +17020,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                 </entryLink>
                 <entryLink id="0e8a-1271-0c1e-59ac" name="Terminator Melee Weapon" hidden="false" collective="false" import="true" targetId="8b46-faad-df3a-6929" type="selectionEntryGroup"/>
                 <entryLink id="525d-f535-ad1f-6052" name="Terminator Ranged Weapon" hidden="false" collective="false" import="true" targetId="bb49-6a88-7ffa-6aa7" type="selectionEntryGroup"/>
-                <entryLink import="true" name="Character Stat Improvement" hidden="true" id="b5dd-b25c-d079-3d0c" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+                <entryLink import="true" name="Character Stat Improvement" hidden="false" id="b5dd-b25c-d079-3d0c" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
                       <conditions>
@@ -18142,7 +18134,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                   </costs>
                 </entryLink>
                 <entryLink id="1177-993b-0f96-0ab9" name="Terminator Lightning Claws" hidden="false" collective="false" import="true" targetId="eeb8-0216-3d95-f0da" type="selectionEntryGroup"/>
-                <entryLink import="true" name="Character Stat Improvement" hidden="true" id="7491-e7ac-b019-ea83" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+                <entryLink import="true" name="Character Stat Improvement" hidden="false" id="7491-e7ac-b019-ea83" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
                       <conditions>
@@ -18377,7 +18369,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                 </entryLink>
                 <entryLink id="2c42-ec3d-0442-e3f4" name="Terminator Melee Weapon" hidden="false" collective="false" import="true" targetId="8b46-faad-df3a-6929" type="selectionEntryGroup"/>
                 <entryLink id="9188-7da9-82b5-863b" name="Terminator Ranged Weapon" hidden="false" collective="false" import="true" targetId="bb49-6a88-7ffa-6aa7" type="selectionEntryGroup"/>
-                <entryLink import="true" name="Character Stat Improvement" hidden="true" id="7de4-9abb-aa29-1f12" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+                <entryLink import="true" name="Character Stat Improvement" hidden="false" id="7de4-9abb-aa29-1f12" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
                       <conditions>
@@ -19350,7 +19342,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="196-5783-ea0d-8663" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="196-5783-ea0d-8663" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -21628,7 +21620,7 @@ If one or more Wounds is discounted due to this special rule, and the unit that
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="20"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="fe72-2838-8e1-ed9c" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="fe72-2838-8e1-ed9c" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -23110,7 +23102,7 @@ If one or more Wounds is discounted due to this special rule, and the unit that
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="f9ef-d5a0-28d1-65a5" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="f9ef-d5a0-28d1-65a5" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -24402,7 +24394,7 @@ If one or more Wounds is discounted due to this special rule, and the unit that
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="8"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="80c2-e559-3b90-df71" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="80c2-e559-3b90-df71" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -28820,7 +28812,7 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
               </costs>
               <entryLinks>
-                <entryLink import="true" name="Character Stat Improvement" hidden="true" id="c52e-54e-29c6-d384" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+                <entryLink import="true" name="Character Stat Improvement" hidden="false" id="c52e-54e-29c6-d384" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
                       <conditions>
@@ -29412,7 +29404,7 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
               </costs>
               <entryLinks>
-                <entryLink import="true" name="Character Stat Improvement" hidden="true" id="5e86-4a3d-3f81-82f1" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+                <entryLink import="true" name="Character Stat Improvement" hidden="false" id="5e86-4a3d-3f81-82f1" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
                       <conditions>
@@ -31039,7 +31031,7 @@ If one or more Wounds is discounted due to this special rule, and the unit that
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="8516-b67b-7330-a2b6" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="8516-b67b-7330-a2b6" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -36541,7 +36533,6 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="1d51-72ff-c102-09d3" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="95a4-07ae-c2e4-fe33" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5d75-f1c7-d6a7-a055" type="equalTo"/>
-                <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4f28-17db-c659-1539" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b23c-e41d-1ffe-1a38" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d3b5-da3a-8c3b-3faf" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7a4d-26dd-c703-2723" type="equalTo"/>
@@ -37063,7 +37054,7 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="76c1-fc04-7465-de60" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="76c1-fc04-7465-de60" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -38678,7 +38669,7 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="519d-189d-12bc-3d45" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="519d-189d-12bc-3d45" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -42812,7 +42803,7 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
               <modifiers>
                 <modifier type="increment" field="d2ee-04cb-5f8a-2642" value="25">
                   <repeats>
-                    <repeat field="selections" scope="23e4-c64b-65b4-c8a5" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" repeats="1" roundUp="false"/>
+                    <repeat field="selections" scope="23e4-c64b-65b4-c8a5" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4b49-fbfe-8078-cae8" repeats="1" roundUp="false"/>
                   </repeats>
                 </modifier>
               </modifiers>
@@ -42821,7 +42812,7 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
               <modifiers>
                 <modifier type="increment" field="d2ee-04cb-5f8a-2642" value="20">
                   <repeats>
-                    <repeat field="selections" scope="23e4-c64b-65b4-c8a5" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" repeats="1" roundUp="false"/>
+                    <repeat field="selections" scope="23e4-c64b-65b4-c8a5" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4b49-fbfe-8078-cae8" repeats="1" roundUp="false"/>
                   </repeats>
                 </modifier>
               </modifiers>
@@ -42830,7 +42821,7 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
               <modifiers>
                 <modifier type="increment" field="d2ee-04cb-5f8a-2642" value="20">
                   <repeats>
-                    <repeat field="selections" scope="23e4-c64b-65b4-c8a5" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" repeats="1" roundUp="false"/>
+                    <repeat field="selections" scope="23e4-c64b-65b4-c8a5" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4b49-fbfe-8078-cae8" repeats="1" roundUp="false"/>
                   </repeats>
                 </modifier>
               </modifiers>
@@ -43678,7 +43669,7 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c31b-d961-037e-8d9e" type="max"/>
               </constraints>
             </entryLink>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="b6d5-c0e4-534e-1c19" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="b6d5-c0e4-534e-1c19" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -44626,7 +44617,7 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                   </costs>
                 </entryLink>
-                <entryLink import="true" name="Character Stat Improvement" hidden="true" id="71a9-da30-8044-dea0" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+                <entryLink import="true" name="Character Stat Improvement" hidden="false" id="71a9-da30-8044-dea0" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
                       <conditions>
@@ -44920,7 +44911,7 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                   </costs>
                 </entryLink>
-                <entryLink import="true" name="Character Stat Improvement" hidden="true" id="e79d-b177-b9d8-bdfb" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+                <entryLink import="true" name="Character Stat Improvement" hidden="false" id="e79d-b177-b9d8-bdfb" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
                       <conditions>
@@ -46434,7 +46425,6 @@ It is not know if this is a mistake or not, as previously like with the Mech boo
               <conditions>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="a621-2c8c-3df0-89d3" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5d75-f1c7-d6a7-a055" type="equalTo"/>
-                <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4f28-17db-c659-1539" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="1d51-72ff-c102-09d3" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d8e9-ff9b-f862-b065" type="equalTo"/>
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="95a4-07ae-c2e4-fe33" type="equalTo"/>
@@ -46797,7 +46787,7 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
             <conditionGroup type="and">
               <conditions>
                 <condition type="equalTo" value="0" field="selections" scope="force" childId="ae4a-f95c-968e-eb46" shared="true" includeChildSelections="true"/>
-                <condition type="equalTo" value="1" field="selections" scope="parent" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -52924,7 +52914,7 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="ce96-7a04-9cd7-22bc" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="ce96-7a04-9cd7-22bc" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -55699,7 +55689,7 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="d94a-2f75-606a-ca70" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e"/>
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="d94a-2f75-606a-ca70" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e"/>
             <entryLink import="true" name="The Legacy of Nikaea" hidden="false" id="bd30-998c-643-c077" type="selectionEntryGroup" targetId="e600-7cf1-217f-42b9"/>
           </entryLinks>
           <modifierGroups>
@@ -56905,7 +56895,7 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
           </costs>
           <entryLinks>
-            <entryLink import="true" name="Character Stat Improvement" hidden="true" id="7ead-fadc-7332-f201" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
+            <entryLink import="true" name="Character Stat Improvement" hidden="false" id="7ead-fadc-7332-f201" type="selectionEntryGroup" targetId="5e99-fcf2-6b64-e88e">
               <modifiers>
                 <modifier type="set" value="false" field="hidden">
                   <conditions>
@@ -59045,7 +59035,7 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
             <conditionGroup type="and">
               <conditions>
                 <condition type="equalTo" value="0" field="selections" scope="force" childId="ae4a-f95c-968e-eb46" shared="true" includeChildSelections="true"/>
-                <condition type="equalTo" value="1" field="selections" scope="parent" childId="4916-965e-8339-44f6" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="4916-965e-8339-44f6" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -63938,7 +63928,11 @@ If the Psychic check is successful then until that Shooting Attack is resolved,
         </rule>
       </rules>
       <entryLinks>
-        <entryLink import="true" name="Company Command Squad" hidden="false" id="1c57-aa25-6aa6-5ad0" type="selectionEntry" targetId="d42c-e6ff-d976-54bc"/>
+        <entryLink import="true" name="Company Command Squad" hidden="false" id="1c57-aa25-6aa6-5ad0" type="selectionEntry" targetId="d42c-e6ff-d976-54bc">
+          <constraints>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="14a1-6a56-d566-64d1" includeChildSelections="false"/>
+          </constraints>
+        </entryLink>
         <entryLink import="true" name="Warlord" hidden="false" id="e6e7-3ce8-52c0-8a3f" type="selectionEntry" targetId="0176-56a3-d590-b103"/>
       </entryLinks>
     </selectionEntry>