diff --git a/2022 - BG - Blackshields.cat b/2022 - BG - Blackshields.cat
index 5373f2d7..7aac7a67 100644
--- a/2022 - BG - Blackshields.cat	
+++ b/2022 - BG - Blackshields.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="cd55-5578-4b1a-67a0" name="BG - Blackshields" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="104" revision="2" battleScribeVersion="2.03" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="cd55-5578-4b1a-67a0" name="BG - Blackshields" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="104" revision="3" battleScribeVersion="2.03" type="catalogue">
   <sharedSelectionEntryGroups>
     <selectionEntryGroup name="Retinue" hidden="false" id="5b3d-ea70-4774-c23d" collective="false" import="true">
       <comment>template_id_be38-a066-4f8e-ae54</comment>
@@ -1980,6 +1980,7 @@ In addition, an army whose Warlord has this trait may make an additional reactio
             </profile>
           </profiles>
         </entryLink>
+        <entryLink import="true" name="Retinue" hidden="false" id="cb05-74a2-4c2b-c093" collective="false" targetId="5b3d-ea70-4774-c23d" type="selectionEntryGroup"/>
       </entryLinks>
       <selectionEntries>
         <selectionEntry type="upgrade" import="true" name="Terrawat-pattern Power Gauntlet" hidden="false" id="f5fb-3eff-fcae-6938" sortIndex="2">
@@ -2012,10 +2013,48 @@ In addition, an army whose Warlord has this trait may make an additional reactio
             </rule>
           </rules>
         </selectionEntry>
+        <selectionEntry type="model" import="true" name="Endryd Haar" hidden="false" id="85a2-0bfe-5e81-4fde">
+          <profiles>
+            <profile name="Endryd Haar" typeId="4bb2-cb95-e6c8-5a21" typeName="Unit" hidden="false" id="e06d-05da-0061-5ca4" publicationId="d882-d2a-5da1-92c4" page="198">
+              <characteristics>
+                <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Infantry (Character, Unique)</characteristic>
+                <characteristic name="Move" typeId="893e-2d76-8f04-44e5">7</characteristic>
+                <characteristic name="WS" typeId="cc42-7ed5-7092-5c84">6</characteristic>
+                <characteristic name="BS" typeId="74ae-c840-0036-d244">4</characteristic>
+                <characteristic name="S" typeId="e478-41d4-a092-48a8">4</characteristic>
+                <characteristic name="T" typeId="c32b-5fdd-3fbe-9b1f">5</characteristic>
+                <characteristic name="W" typeId="57ee-1126-32a9-5672">4</characteristic>
+                <characteristic name="I" typeId="62d3-22d7-2d49-52dc">4</characteristic>
+                <characteristic name="A" typeId="f111-2ce5-dd12-d6b0">4</characteristic>
+                <characteristic name="Ld" typeId="e8a6-1da9-d384-8727">10</characteristic>
+                <characteristic name="Save" typeId="e593-6b3c-f169-04f0">2+</characteristic>
+              </characteristics>
+            </profile>
+          </profiles>
+          <constraints>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="6fac-c175-acb3-61a4"/>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="ea6e-d082-b448-f1c2"/>
+          </constraints>
+          <infoLinks>
+            <infoLink name="Master of the Legion" id="aef7-fd14-fddb-cf64" hidden="false" type="rule" targetId="c772-87ea-d49c-c7ba"/>
+            <infoLink name="Relentless" id="2891-ea46-28b6-4961" hidden="false" type="rule" targetId="7adf-ac9a-5035-522d"/>
+            <infoLink name="Hatred (X)" id="e52a-dab0-9d73-1232" hidden="false" type="rule" targetId="dc0b-fe69-6b71-e0a4">
+              <modifiers>
+                <modifier type="set" value="Hatred (World Eaters)" field="name"/>
+              </modifiers>
+            </infoLink>
+            <infoLink name="Battle-Hardened (X)" id="8245-51c9-2aea-65ba" hidden="false" type="rule" targetId="5c3b-ed0b-4ad0-d547">
+              <modifiers>
+                <modifier type="set" value="Battle-Hardened (1)" field="name"/>
+              </modifiers>
+            </infoLink>
+          </infoLinks>
+        </selectionEntry>
       </selectionEntries>
       <categoryLinks>
         <categoryLink targetId="8b4f-bfe2-ce7b-f1b1" id="65eb-4e66-4e5d-dc82" primary="false" name="Infantry Unit Type"/>
         <categoryLink targetId="11f2-472f-c1d1-9ae9" id="c70c-90a9-bd79-6805" primary="false" name="Legiones Astartes"/>
+        <categoryLink targetId="4f07-3d45-4f28-a0c6" id="ce79-2971-9182-056f" primary="false" name="Independent Character"/>
       </categoryLinks>
     </selectionEntry>
   </sharedSelectionEntries>
diff --git a/2022 - Daemons - Bound Daemons.cat b/2022 - Daemons - Bound Daemons.cat
index 3b253b27..fa2fd043 100644
--- a/2022 - Daemons - Bound Daemons.cat	
+++ b/2022 - Daemons - Bound Daemons.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="e545-295b-4cd9-f235" name="Daemons - Bound Daemons" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="56" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="e545-295b-4cd9-f235" name="Daemons - Bound Daemons" revision="9" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="56" type="catalogue">
   <entryLinks>
     <entryLink id="250f-d164-bb7e-7025" name="Bound Daemon Brutes" hidden="false" collective="false" import="false" targetId="519f-866e-e6fe-20e0" type="selectionEntry">
       <modifiers>
@@ -655,6 +655,7 @@ During a Reaction made in any Phase, a player may not choose to activate a model
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="cc6-f5be-8bbc-2afd"/>
           </constraints>
         </entryLink>
+        <entryLink import="true" name="Samus, Ka’bandha &amp; Cor&apos;bax Warlord stuff" hidden="false" id="7ff8-c529-ef6d-9bb0" collective="false" targetId="092d-3716-36f8-8988" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="525"/>
diff --git a/2022 - Daemons - Daemons of the Ruinstorm.cat b/2022 - Daemons - Daemons of the Ruinstorm.cat
index 4e7a73f3..1bb5421c 100644
--- a/2022 - Daemons - Daemons of the Ruinstorm.cat	
+++ b/2022 - Daemons - Daemons of the Ruinstorm.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="ac63-5340-2e9e-1eb6" name="Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="12" battleScribeVersion="2.03" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="ac63-5340-2e9e-1eb6" name="Daemons - Daemons of the Ruinstorm" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="13" battleScribeVersion="2.03" type="catalogue">
   <entryLinks>
     <entryLink import="false" name="Daemons of the Ruinstorm" hidden="false" type="selectionEntry" id="e271-f450-1c28-5b7b" targetId="afca-3047-fb26-d097">
       <constraints>
@@ -120,9 +120,21 @@
         <categoryLink targetId="2eaf-32d6-9d1d-d906" id="3bd5-dd10-1738-7cb0" primary="false" name="LoW &amp; Primarchs (25% Limit)"/>
       </categoryLinks>
     </entryLink>
-    <entryLink import="true" name="Expeditionary Navigator" hidden="false" type="selectionEntry" id="9c45-3bab-77a7-1588" targetId="ce53-e40c-65b6-4d3a"/>
-    <entryLink import="true" name="Davinite Lodge Priest" hidden="false" type="selectionEntry" id="430c-1c94-e60f-653" targetId="fe13-4a8f-b2af-1e40"/>
-    <entryLink import="true" name="Cults Abominatio" hidden="false" type="selectionEntry" id="5b8b-6c4f-15ec-ba95" targetId="4a00-03d4-a850-884b"/>
+    <entryLink import="false" name="Expeditionary Navigator" hidden="false" type="selectionEntry" id="9c45-3bab-77a7-1588" targetId="ce53-e40c-65b6-4d3a">
+      <categoryLinks>
+        <categoryLink targetId="4f85-eb33-30c9-8f51" id="42f2-a7cc-161c-7108" primary="true" name="HQ:"/>
+      </categoryLinks>
+    </entryLink>
+    <entryLink import="false" name="Davinite Lodge Priest" hidden="false" type="selectionEntry" id="430c-1c94-e60f-653" targetId="fe13-4a8f-b2af-1e40">
+      <categoryLinks>
+        <categoryLink targetId="4f85-eb33-30c9-8f51" id="d5e9-9d7e-2a4d-311d" primary="true" name="HQ:"/>
+      </categoryLinks>
+    </entryLink>
+    <entryLink import="false" name="Cults Abominatio" hidden="false" type="selectionEntry" id="5b8b-6c4f-15ec-ba95" targetId="4a00-03d4-a850-884b">
+      <categoryLinks>
+        <categoryLink targetId="4f85-eb33-30c9-8f51" id="5f61-7027-ca66-53d3" primary="true" name="HQ:"/>
+      </categoryLinks>
+    </entryLink>
   </entryLinks>
   <sharedSelectionEntries>
     <selectionEntry type="unit" import="true" name="Ruinstorm Daemon Sovereign" hidden="false" id="2f3f-adc4-b19f-a5c7" publicationId="8775-88f5-cfdd-24f6" page="6">
@@ -1767,6 +1779,7 @@ If Sanguinius is removed as a casualty while fighting in a Challenge against Ka&
             <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="2125-3451-f7bd-736b"/>
           </constraints>
         </entryLink>
+        <entryLink import="true" name="Samus, Ka’bandha &amp; Cor&apos;bax Warlord stuff" hidden="false" id="fd80-0e3b-c4cd-e92c" collective="false" targetId="092d-3716-36f8-8988" type="selectionEntry"/>
       </entryLinks>
       <categoryLinks>
         <categoryLink targetId="e699-d9cd-e68e-46d9" id="2fba-d3f5-73dc-6901" primary="false" name="Daemon Unit Type"/>
diff --git a/2022 - Horus Heresy.gst b/2022 - Horus Heresy.gst
index 931e7cac..964d30d7 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="111" battleScribeVersion="2.03" type="gameSystem">
+<gameSystem xmlns="http://www.battlescribe.net/schema/gameSystemSchema" id="28d4-bd2e-4858-ece6" name="Horus Heresy (2022)" revision="112" 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"/>
@@ -1156,11 +1156,11 @@ In addition, when a Fast Vehicle moves, it may choose to move at Flat-out:</desc
       <profiles>
         <profile id="bbd6-2bc7-864d-067d" name="1) Reactions in Zone Mortalis" hidden="false" typeId="90b9-7fab-87db-aed3" typeName="Reactions">
           <characteristics>
-            <characteristic name="Description" typeId="c627-4637-8de5-65fb">When making Reactions during a Zone Mortalis battle, an army may not choose to use any of the Core Reactions presented in the Horus Heresy ~ Age of Darkness rulebook nor any army list specific Advanced Reactions 
+            <characteristic name="Description" typeId="c627-4637-8de5-65fb">When making Reactions during a Zone Mortalis battle, an army may not choose to use any of the Core Reactions presented in the Horus Heresy ~ Age of Darkness rulebook nor any army list specific Advanced Reactions
 Instead, all armies, regardless of Faction or size, may only choose to use any or all of the Zone Mortalis Reactions as presented in this supplement during a Zone Mortalis battle or any of the standard Advanced Reactions in the Horus Heresy - Age of Darkness rulebook.
 
-Base Raction Allotment, Additional Reactions and Reaction Limited in Smaller Games.
-In games with a total army size of 1,000 points or fewer per player, any player may make one (1) Reaction in each Phase of their opponent&apos;s turn. This number may not be increased in any way. Regardless of any modifications to a player&apos;s Reaction Allotment or special rules granting additional Reactions, the Reactive player may never make more than one(1) Reaction in any single Phase.</characteristic>
+Base Reaction Allotment, Additional Reactions and Reaction Limited in Smaller Games.
+In games with a total army size of 1,000 points or fewer per player, any player may make one (1) Reaction in each Phase of their opponent&apos;s turn. This number may not be increased in any way. Regardless of any modifications to a player&apos;s Reaction Allotment or special rules granting additional Reactions, the Reactive player may never make more than one (1) Reaction in any single Phase.</characteristic>
           </characteristics>
         </profile>
         <profile id="356c-76e3-ec76-65df" name="2) ZM Movement Phase Reactions" hidden="false" typeId="90b9-7fab-87db-aed3" typeName="Reactions">
@@ -1168,7 +1168,7 @@ In games with a total army size of 1,000 points or fewer per player, any player
             <characteristic name="Description" typeId="c627-4637-8de5-65fb">REACTIONS IN THE MOVEMENT PHASE
 During the Movement phase, the Reactive player may declare a Reaction if an enemy unit ends a move within 12&quot; and in line of sight of a friendly unit. Once the Active player has completely resolved the movement of their unit, the Reactive player may choose to expend their Reaction in that Phase in order to have the unit they control that is within 12&quot; and line of sight perform a Suppress Reaction.
 
-Suppress - The Reacting unit may make a Shooting Attack, targeting the unit that triggered this Reaction and following all the usual rules for Shooting Attacks. A unit that makes a Shooting Attack as part of a Suppress Reaction may not make any attacks indirectly (without line of sight). All Shooting Attacks made as part of a Suppress Reaction are Snap Shots, with the exception of Template Weapons. Note that this prevents models from making attacks with weapons that have the Blast (X) special rule as part of this Reaction. Template Weapons may only be used as part of a Suppress Reaction if the target unit is within 8&quot; and must use the Wall of Death rule instead of firing normally. Models in the Reacting unit count as Stationary during this Shooting Attack, even if they moved in the previous Movement phase.</characteristic>
+Suppress - The Reacting unit may make a Shooting Attack, targeting the unit that triggered this Reaction and following all the usual rules for Shooting Attacks. A unit that makes a Shooting Attack as part of a Suppress Reaction may not make any attacks indirectly (without line of sight). All Shooting Attacks made as part of a Suppress Reaction are Snap Shots, and gain the pinning special rule if they do not already have it.</characteristic>
           </characteristics>
         </profile>
         <profile id="47f5-85fb-1b8b-a13e" name="3) ZM Shooting Phase Reactions" hidden="false" typeId="90b9-7fab-87db-aed3" typeName="Reactions">
@@ -1176,7 +1176,7 @@ Suppress - The Reacting unit may make a Shooting Attack, targeting the unit that
             <characteristic name="Description" typeId="c627-4637-8de5-65fb">REACTIONS IN THE SHOOTING PHASE
 During the Shooting phase, the Reactive player may react when any enemy unit declares a Shooting Attack targeting a unit they control. Before the Active player resolves the Shooting Attack, the Reactive player may choose to expend their Reaction in that Phase to have the unit targeted by the Shooting Attack perform a Displace Reaction.
 
-Displace - Each model in the Reacting unit may move a number of inches up to its unmodified Initiative Characteristic. When resolving the Shooting Attack that triggered this Reaction, all range and line of sight is measured to the Reacting unit’s new position. If, as a result of this movement, no models in the reacting unit are within range or line of sight of any models in the triggering unit, the Active player cannot choose a new target for their Shooting Attack.</characteristic>
+Displace - Each model in the Reacting unit may move a number of inches up to the highest unmodified Initiative Characteristic of any model in the unit. When resolving the Shooting Attack that triggered this Reaction, all range and line of sight is measured to the Reacting unit’s new position. If as a result of this movement, no models in the reacting unit are within line of sight of any models in the triggering unit, the Active player cannot choose a new target for their Shooting Attack.</characteristic>
           </characteristics>
         </profile>
         <profile id="6c7a-4ba0-361e-f626" name="4) ZM Assualt Phase Reactions" hidden="false" typeId="90b9-7fab-87db-aed3" typeName="Reactions">
@@ -1184,7 +1184,7 @@ Displace - Each model in the Reacting unit may move a number of inches up to its
             <characteristic name="Description" typeId="c627-4637-8de5-65fb">REACTIONS IN THE ASSAULT PHASE
 During the Assault phase, the Reactive player may react when any enemy unit declares a Charge targeting a unit they control. Before the Active player has resolved any Charge Rolls, the Reactive player may choose to expend their Reaction in that Phase to have the unit targeted by the Charge perform a Brace Reaction.
 
-Brace - The Reacting unit must make a Morale check. If the Check is failed, the Reacting unit immediately Fall Backs 1D6&quot; and automatically regroups when this Fall Back Move is completed. If the Check is successful, the Reacting unit automatically passes any Morale checks they are required to make as a result of losing an assault during the following Fight sub-phase.</characteristic>
+Brace - The Reacting unit must make a Morale check. If the Check is failed, the Reacting unit immediately Fall Backs D6&quot; and automatically regroups when this Fall Back Move is completed 1&quot; from the battlefield edge, If the Check is successful, the Reacting unit automatically passes any Morale checks they are required to make as a result of losing an assault during the following Fight sub-phase.</characteristic>
           </characteristics>
         </profile>
       </profiles>
@@ -1435,6 +1435,21 @@ If a Skimmer is Immobilised or Wrecked, its base is removed, if possible. If thi
     <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"/>
+    <categoryEntry id="7e5d-d73e-8ff4-7345" name="Anathema Sub-type" publicationId="15a4-fc68-502d-48a9" page="129" hidden="false">
+      <rules>
+        <rule id="e2d9-fe0d-1717-3a37" name="Anathema Sub-type" publicationId="15a4-fc68-502d-48a9" page="129" hidden="false">
+          <description>• A unit that includes at least one model with the Anathema Sub-type may not be directly targeted by any Psychic Power or use any Psychic power or make attacks with a Psychic Weapon, Psychic Powers whose effects would otherwise be applied to a unit that includes at least one model with the Anathema Sub-type (due to area of effect, scattering or other rules) have no effect, but are not cancelled and may continue to affect other units.
+• A model with the Anathema Sub-type that is allocated Wounds caused by a Psychic Weapon (which is any weapon granted to a unit or model by a Psychic Discipline) will always fail to Wound without any dice being rolled and any special rules attached to that Psychic Weapon will not trigger. Any Wounds allocated to a model with the Anathema Unit Sub-type caused by a Force Weapon gain no benefit from the Force special rules, but are otherwise resolved as normal. These effects do not apply to a model with the Transport Sub-type that has models with the Anathema Sub-type Embarked within, unless the model with the Transport Sub-type also has the Anathema Sub-type.
+• All models that no not have the Anathema Sub-type but are part of a unit that includes one of more models with the Anathema Sub-type, suffer a penalty of -2 to their Leadership Characteristic. Any unit with at least one model within 6&quot; of a model with the Anathema Sub-type suffers a penalty of -1 to the Leadership of all models in the unit that do not also have the Anathema Sub-type, or -2 if that unit includes one of more models with the Corrupted Unit Sub-type. Note that these two penalties are not cumulative; they apply only the more severe penalty. However, they do stack with other special that modify Leadership (such as Fear (X)).
+• A unit that is Embarked on a Vehicle, Fortification or Building suffers no penalties to its Leadership Characteristic due to the Anathema Sub-type, However, units with the Stubborn special rule do suffer penalties to their Leadership from the effects of this Sub-type (note that this only applies to the Stubborn special rule, and other special rules that ignore penalties to Leadership ignore the effects of the Anathema Sub-type).
+
+
+From December 2023 Liber Imperium FAQ V1.1, page 2:
+
+In addition, the Leadership Characteristic of a model with the Anathema Unit Sub-type can only be used for a Leadership test or Morale check if all models in that unit have the Anathema Unit Sub-type</description>
+        </rule>
+      </rules>
+    </categoryEntry>
   </categoryEntries>
   <forceEntries>
     <forceEntry id="d926-652f-8436-30ce" name="1. Crusade Force Organisation Chart" hidden="false">
@@ -1506,7 +1521,6 @@ If a Skimmer is Immobilised or Wrecked, its base is removed, if possible. If thi
                 <conditionGroup type="or">
                   <conditions>
                     <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="41b5-73f0-cdc9-1f83" type="equalTo"/>
-                    <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b23c-e41d-1ffe-1a38" type="equalTo"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
@@ -2108,6 +2122,7 @@ If a Skimmer is Immobilised or Wrecked, its base is removed, if possible. If thi
           </constraints>
         </categoryLink>
         <categoryLink id="e983-382e-a5c8-f531" name="Rite of War:" hidden="false" targetId="d494-e450-d4aa-579a" primary="false"/>
+        <categoryLink name="Blackshield Oaths" hidden="false" id="7c22-5ebb-e4b4-65b2" targetId="cb34-ca48-547a-5d90"/>
         <categoryLink id="5f35-9da8-f131-1f90" name="The Rewards Of Treachery" hidden="false" targetId="c5d2-69ee-8787-55d9" primary="false"/>
         <categoryLink id="a23c-357c-3c10-db1f" name="Provenances of War" hidden="false" targetId="346a-fb59-a199-25c4" primary="false"/>
         <categoryLink name="Ætheric Dominion (Whole Army)" hidden="false" id="8ed0-dc42-a148-4a7c" targetId="5d31-e5d-67bd-1083">
@@ -2423,7 +2438,7 @@ If a Skimmer is Immobilised or Wrecked, its base is removed, if possible. If thi
                     <conditionGroup type="and">
                       <conditions>
                         <condition type="atLeast" value="1" field="selections" scope="force" childId="3410-6cb0-2f2b-a28a" shared="true" includeChildSelections="true"/>
-                        <condition type="instanceOf" value="0" field="selections" scope="ancestor" childId="d926-652f-8436-30ce" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="d926-652f-8436-30ce" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -2446,8 +2461,8 @@ If a Skimmer is Immobilised or Wrecked, its base is removed, if possible. If thi
                   <conditionGroups>
                     <conditionGroup type="and">
                       <conditions>
-                        <condition type="instanceOf" value="0" field="selections" scope="ancestor" childId="d926-652f-8436-30ce" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                         <condition type="atLeast" value="1" field="selections" scope="force" childId="3410-6cb0-2f2b-a28a" shared="true" includeChildSelections="true"/>
+                        <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="d926-652f-8436-30ce" shared="true"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -7356,6 +7371,7 @@ Thaumaturge’s Cleansing (Psychic Weapon)</description>
                 <condition field="selections" scope="ancestor" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="d4f2-6da5-b6de-06ec" type="instanceOf"/>
                 <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="58a7-8821-3cd9-c73" shared="true"/>
                 <condition type="equalTo" value="1" field="selections" scope="force" childId="ced-ce18-5d5b-e54" shared="true" includeChildSelections="true"/>
+                <condition type="equalTo" value="1" field="selections" scope="roster" childId="092d-3716-36f8-8988" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -7380,11 +7396,17 @@ Thaumaturge’s Cleansing (Psychic Weapon)</description>
             <condition type="equalTo" value="1" field="selections" scope="force" childId="ced-ce18-5d5b-e54" shared="true" includeChildSelections="true"/>
           </conditions>
         </modifier>
+        <modifier type="set" value="0" field="1028-fef6-d630-344c">
+          <conditions>
+            <condition type="equalTo" value="1" field="selections" scope="force" childId="ced-ce18-5d5b-e54" shared="true" includeChildSelections="true"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="5617-ada9-bf10-f9b0" type="max"/>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="4024-fa03-dada-cc4b" type="max"/>
         <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="0dff-37d2-448b-45a6" type="min"/>
+        <constraint type="min" value="1" field="selections" scope="roster" shared="true" id="1028-fef6-d630-344c" includeChildSelections="true"/>
       </constraints>
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
diff --git a/2022 - LA - Death Guard.cat b/2022 - LA - Death Guard.cat
index 8309757c..4b5424f1 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="37" 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="38" 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>
@@ -115,6 +115,9 @@
         <categoryLink id="952c-b3c9-50e1-b074" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
         <categoryLink id="bd34-12ec-2df1-8239" name="Compulsory HQ:" hidden="false" targetId="f823-8c1d-6a87-26a1" primary="false"/>
       </categoryLinks>
+      <entryLinks>
+        <entryLink import="true" name="Retinue" hidden="false" id="4472-a2ae-3b86-1399" collective="false" targetId="2bcb-6e52-0eb9-9ffe" type="selectionEntryGroup"/>
+      </entryLinks>
     </entryLink>
     <entryLink id="47ce-73d3-f6bf-7f54" name="XIV: Death Guard" hidden="false" collective="false" import="false" targetId="dd1f-1c51-706c-e5f7" type="selectionEntry">
       <modifiers>
diff --git a/2022 - LA - Imperial Fists.cat b/2022 - LA - Imperial Fists.cat
index 7d2515ef..40360f5b 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="38" 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="39" 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>
@@ -4201,6 +4201,14 @@
                         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                       </costs>
                     </entryLink>
+                    <entryLink import="true" name="Solarite Power Gauntlet" hidden="false" id="c890-15d2-ccb0-b9ff" collective="false" targetId="b682-2c89-f979-aa74" type="selectionEntry">
+                      <modifiers>
+                        <modifier type="set" value="false" field="hidden"/>
+                      </modifiers>
+                      <costs>
+                        <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
+                      </costs>
+                    </entryLink>
                   </entryLinks>
                 </selectionEntryGroup>
               </selectionEntryGroups>
diff --git a/2022 - LA - Salamanders.cat b/2022 - LA - Salamanders.cat
index e255dc21..ff016c61 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="42" 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="43" 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>
@@ -4103,25 +4103,19 @@
                 </modifier>
               </modifiers>
             </entryLink>
-            <entryLink id="2b8f-162c-9c16-1768" name="Dreadclaw Drop Pod" hidden="false" collective="false" import="true" targetId="bbe8-818d-3068-d79c" type="selectionEntry">
+            <entryLink import="true" name="Dreadclaw Drop Pod" hidden="true" id="13d9-deb0-6592-22c6" collective="false" targetId="bbe8-818d-3068-d79c" type="selectionEntry">
               <modifiers>
-                <modifier type="set" field="hidden" value="true">
+                <modifier type="set" value="false" field="hidden">
                   <conditionGroups>
-                    <conditionGroup type="or">
+                    <conditionGroup type="and">
                       <conditions>
-                        <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2c36-fde3-14ed-4db4" 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="a621-2c8c-3df0-89d3" type="equalTo"/>
-                        <condition field="selections" scope="6775-8379-8d6b-9614" value="5" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" type="greaterThan"/>
-                        <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ed1f-9473-df70-4544" type="equalTo"/>
+                        <condition type="equalTo" value="1" field="selections" scope="force" childId="1977-49f2-7910-f177" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="atMost" value="4" field="selections" scope="6775-8379-8d6b-9614" childId="model" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
                 </modifier>
               </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="9229-6214-1256-a98a" type="max"/>
-              </constraints>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
diff --git a/2022 - LA - Space Wolves.cat b/2022 - LA - Space Wolves.cat
index 0cba3a40..d6556bfa 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="39" 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="40" 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>
@@ -479,6 +479,25 @@
             </modifier>
           </modifiers>
         </entryLink>
+        <entryLink import="true" name="Retinue (Caster/Speaker)" hidden="false" id="0890-7aff-c09e-70c7" collective="false" targetId="e6b4-bd3b-1d71-963c" type="selectionEntryGroup">
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <comment>node_id_8287-16ff-46ba-9838</comment>
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="equalTo" value="0" field="selections" scope="parent" childId="e9ab-2cc5-4507-eded" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false">
+                      <comment>node_id_81c1-fca9-44dc-ba4c</comment>
+                    </condition>
+                    <condition type="equalTo" value="0" field="selections" scope="parent" childId="b625-1cef-3057-156c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false">
+                      <comment>node_id_81c1-fca9-44dc-ba4c</comment>
+                    </condition>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </entryLink>
       </entryLinks>
     </entryLink>
     <entryLink id="ec0e-c9eb-67cb-f9d8" name="Centurion, Tartaros" hidden="false" collective="false" import="false" targetId="f806-8a4e-d0d6-beaa" type="selectionEntry">
@@ -511,6 +530,25 @@
             </modifier>
           </modifiers>
         </entryLink>
+        <entryLink import="true" name="Retinue (Caster/Speaker)" hidden="false" id="1ede-0450-03f9-64e2" collective="false" targetId="e6b4-bd3b-1d71-963c" type="selectionEntryGroup">
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <comment>node_id_8287-16ff-46ba-9838</comment>
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition type="equalTo" value="0" field="selections" scope="parent" childId="e9ab-2cc5-4507-eded" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false">
+                      <comment>node_id_81c1-fca9-44dc-ba4c</comment>
+                    </condition>
+                    <condition type="equalTo" value="0" field="selections" scope="parent" childId="b625-1cef-3057-156c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false">
+                      <comment>node_id_81c1-fca9-44dc-ba4c</comment>
+                    </condition>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </entryLink>
       </entryLinks>
     </entryLink>
     <entryLink id="2c9a-afc1-adf7-ca0a" name="Cerberus Squadron" hidden="false" collective="false" import="false" targetId="137a-e079-34cd-8161" type="selectionEntry">
diff --git a/2022 - LA - White Scars.cat b/2022 - LA - White Scars.cat
index c443e90d..b2ea428e 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="43" 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="44" 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>
@@ -3426,6 +3426,11 @@
                   </costs>
                 </entryLink>
                 <entryLink id="a0d6-d7e7-83b1-cb65" name="Chainsword" hidden="false" collective="false" import="true" targetId="06e7-a6ae-ed1c-eb03" type="selectionEntry"/>
+                <entryLink import="true" name="Power Lance" hidden="false" id="ac04-64b6-13c2-0424" collective="false" targetId="a4c8-c8ff-87f2-1ac9" type="selectionEntry">
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
@@ -3516,6 +3521,11 @@
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
               </costs>
             </entryLink>
+            <entryLink import="true" name="Power Lance" hidden="false" id="a371-0de8-16ad-f696" collective="false" targetId="a4c8-c8ff-87f2-1ac9" type="selectionEntry">
+              <costs>
+                <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+              </costs>
+            </entryLink>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
diff --git a/2022 - LI - Assassins.cat b/2022 - LI - Assassins.cat
index 14218a87..eb80c6a3 100644
--- a/2022 - LI - Assassins.cat	
+++ b/2022 - LI - Assassins.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="4c88-1a81-7e53-0a67" name="LI - Assassins and Agents" revision="13" battleScribeVersion="2.03" authorName="Maye Gelt" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="4c88-1a81-7e53-0a67" name="LI - Assassins and Agents" revision="14" battleScribeVersion="2.03" authorName="Maye Gelt" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
   <sharedSelectionEntries>
     <selectionEntry id="c1fd-3919-f4bf-a990" name="Clade Adamus Assassin" publicationId="15a4-fc68-502d-48a9" page="120" hidden="false" collective="false" import="true" type="unit">
       <profiles>
@@ -259,10 +259,10 @@
           <profiles>
             <profile id="8fc6-4332-1aa3-c2dc" name="Phase Sword" publicationId="15a4-fc68-502d-48a9" page="117" hidden="false" typeId="1a1a-e592-2849-a5c0" typeName="Weapon">
               <characteristics>
-                <characteristic name="Range" typeId="95ba-cda7-b831-6066"/>
-                <characteristic name="Strength" typeId="24d9-b8e1-a355-2458"/>
-                <characteristic name="AP" typeId="f7a6-e0d8-7973-cd8d"/>
-                <characteristic name="Type" typeId="2f86-c8b4-b3b4-3ff9"/>
+                <characteristic name="Range" typeId="95ba-cda7-b831-6066">-</characteristic>
+                <characteristic name="Strength" typeId="24d9-b8e1-a355-2458">3</characteristic>
+                <characteristic name="AP" typeId="f7a6-e0d8-7973-cd8d">1</characteristic>
+                <characteristic name="Type" typeId="2f86-c8b4-b3b4-3ff9">Melee, Rending (5+), Phase Shift</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -329,6 +329,7 @@
         <categoryLink id="edc8-fbd6-fbfa-8d87" name="Assassin Sub-type" hidden="false" targetId="d615-c0e4-6d17-107e" primary="false"/>
         <categoryLink id="83c9-6e6a-ce45-7fff" name="Character" hidden="false" targetId="f75a-d5c1-59ba-5c5a" primary="false"/>
         <categoryLink id="0d61-9b1f-333c-a79c" name="Light Sub-type" hidden="false" targetId="bff2-ae16-74a8-8712" primary="false"/>
+        <categoryLink targetId="7e5d-d73e-8ff4-7345" id="7f4b-6ed1-219f-acb3" primary="false" name="Anathema Sub-type"/>
       </categoryLinks>
       <selectionEntries>
         <selectionEntry id="343f-f172-a3ec-18d6" name="Life Drain" publicationId="15a4-fc68-502d-48a9" page="115" hidden="false" collective="false" import="true" type="upgrade">
diff --git a/2022 - LI - Custodes.cat b/2022 - LI - Custodes.cat
index 18e2736a..007e5403 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="23" 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="24" 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>
@@ -644,7 +644,7 @@
                 <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="37ca-b33b-d5fc-189e" type="max"/>
               </constraints>
               <selectionEntries>
-                <selectionEntry id="6d4b-aee5-b85f-9f58" name="Master-Crafted Power Axe and Vexilla" hidden="false" collective="false" import="true" type="model">
+                <selectionEntry id="6d4b-aee5-b85f-9f58" name="Master-Crafted Power Axe and Vexilla" hidden="false" collective="false" import="true" type="upgrade">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="45f5-3865-c009-9f82" type="max"/>
                   </constraints>
@@ -667,7 +667,7 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="19c8-d685-7196-58bc" name="Master-Crafted Power Lance and Vexilla" hidden="false" collective="false" import="true" type="model">
+                <selectionEntry id="19c8-d685-7196-58bc" name="Master-Crafted Power Lance and Vexilla" hidden="false" collective="false" import="true" type="upgrade">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="615d-11c4-3775-1488" type="max"/>
                   </constraints>
@@ -690,7 +690,7 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="9285-4888-9b57-c21b" name="Master-Crafted Power Maul and Vexilla" hidden="false" collective="false" import="true" type="model">
+                <selectionEntry id="9285-4888-9b57-c21b" name="Master-Crafted Power Maul and Vexilla" hidden="false" collective="false" import="true" type="upgrade">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0283-500a-8257-03a1" type="max"/>
                   </constraints>
@@ -713,7 +713,7 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="d644-d8ba-4516-5ba8" name="Master-Crafted Power Sword and Vexilla" hidden="false" collective="false" import="true" type="model">
+                <selectionEntry id="d644-d8ba-4516-5ba8" name="Master-Crafted Power Sword and Vexilla" hidden="false" collective="false" import="true" type="upgrade">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b129-f43b-47fa-24dc" type="max"/>
                   </constraints>
@@ -736,7 +736,7 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="d3eb-8610-7350-eb32" name="Sentinal Warblade &amp; Vexilla" hidden="false" collective="false" import="true" type="model">
+                <selectionEntry id="d3eb-8610-7350-eb32" name="Sentinal Warblade &amp; Vexilla" hidden="false" collective="false" import="true" type="upgrade">
                   <constraints>
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2f96-b1fa-9720-8d40" type="max"/>
                   </constraints>
diff --git a/2022 - LI - Sisters Of Silence.cat b/2022 - LI - Sisters Of Silence.cat
index 50099c78..9a24fe31 100644
--- a/2022 - LI - Sisters Of Silence.cat	
+++ b/2022 - LI - Sisters Of Silence.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="585a-5ac2-a233-a6a6" name="LI - Sisters of Silence" 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="585a-5ac2-a233-a6a6" name="LI - Sisters of Silence" revision="22" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
   <categoryEntries>
     <categoryEntry id="b760-8313-847f-1afa" name="Obivion HQ" hidden="false"/>
     <categoryEntry id="a9b6-f66f-e8ee-553e" name="Judgement HQ" hidden="false"/>
@@ -44,21 +44,6 @@
         </rule>
       </rules>
     </categoryEntry>
-    <categoryEntry id="7e5d-d73e-8ff4-7345" name="Anathema Sub-type" publicationId="15a4-fc68-502d-48a9" page="129" hidden="false">
-      <rules>
-        <rule id="e2d9-fe0d-1717-3a37" name="Anathema Sub-type" publicationId="15a4-fc68-502d-48a9" page="129" hidden="false">
-          <description>• A unit that includes at least one model with the Anathema Sub-type may not be directly targeted by any Psychic Power or use any Psychic power or make attacks with a Psychic Weapon, Psychic Powers whose effects would otherwise be applied to a unit that includes at least one model with the Anathema Sub-type (due to area of effect, scattering or other rules) have no effect, but are not cancelled and may continue to affect other units.
-• A model with the Anathema Sub-type that is allocated Wounds caused by a Psychic Weapon (which is any weapon granted to a unit or model by a Psychic Discipline) will always fail to Wound without any dice being rolled and any special rules attached to that Psychic Weapon will not trigger. Any Wounds allocated to a model with the Anathema Unit Sub-type caused by a Force Weapon gain no benefit from the Force special rules, but are otherwise resolved as normal. These effects do not apply to a model with the Transport Sub-type that has models with the Anathema Sub-type Embarked within, unless the model with the Transport Sub-type also has the Anathema Sub-type.
-• All models that no not have the Anathema Sub-type but are part of a unit that includes one of more models with the Anathema Sub-type, suffer a penalty of -2 to their Leadership Characteristic. Any unit with at least one model within 6&quot; of a model with the Anathema Sub-type suffers a penalty of -1 to the Leadership of all models in the unit that do not also have the Anathema Sub-type, or -2 if that unit includes one of more models with the Corrupted Unit Sub-type. Note that these two penalties are not cumulative; they apply only the more severe penalty. However, they do stack with other special that modify Leadership (such as Fear (X)).
-• A unit that is Embarked on a Vehicle, Fortification or Building suffers no penalties to its Leadership Characteristic due to the Anathema Sub-type, However, units with the Stubborn special rule do suffer penalties to their Leadership from the effects of this Sub-type (note that this only applies to the Stubborn special rule, and other special rules that ignore penalties to Leadership ignore the effects of the Anathema Sub-type).
-
-
-From December 2023 Liber Imperium FAQ V1.1, page 2:
-
-In addition, the Leadership Characteristic of a model with the Anathema Unit Sub-type can only be used for a Leadership test or Morale check if all models in that unit have the Anathema Unit Sub-type</description>
-        </rule>
-      </rules>
-    </categoryEntry>
   </categoryEntries>
   <entryLinks>
     <entryLink id="40fe-f2c8-6823-f3ff" name="Sisters of Silence" hidden="false" collective="false" import="false" targetId="4d60-2ab7-244f-3414" type="selectionEntry">
diff --git a/2022 - LI - Solar Auxilia.cat b/2022 - LI - Solar Auxilia.cat
index d9ed3982..6d5f782a 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="40" 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="41" 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>
@@ -47,9 +47,14 @@
     <selectionEntry id="c9b6-946c-a4cb-9083" name="Armoured Fist - Leman Russ Command Tank" hidden="false" collective="false" import="false" type="upgrade">
       <modifiers>
         <modifier type="set" field="2e2c-488b-6bec-5ced" value="1">
-          <conditions>
-            <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="1974-9f9a-5b14-e449" type="equalTo"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="equalTo" value="1" field="selections" scope="force" childId="1974-9f9a-5b14-e449" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                <condition type="instanceOf" value="0" field="selections" scope="ancestor" childId="d926-652f-8436-30ce" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
         <modifier type="set" field="hidden" value="true">
           <conditions>
diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
index a68898f2..a09857b7 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="189" 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="190" 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"/>
@@ -5568,10 +5568,17 @@ When a model has two Raven’s Talons, that model gains +2 Attacks instead of th
                   <modifiers>
                     <modifier type="set" field="hidden" value="true">
                       <conditionGroups>
-                        <conditionGroup type="and">
+                        <conditionGroup type="or">
+                          <conditionGroups>
+                            <conditionGroup type="and">
+                              <conditions>
+                                <condition type="equalTo" value="1" field="selections" scope="aa72-63e4-bc60-4611" childId="8e05-7d1e-16e4-1669" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="1" field="selections" scope="force" childId="b2b4-2198-0b90-dd9f" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                              </conditions>
+                            </conditionGroup>
+                          </conditionGroups>
                           <conditions>
-                            <condition field="selections" scope="aa72-63e4-bc60-4611" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8e05-7d1e-16e4-1669" type="equalTo"/>
-                            <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b2b4-2198-0b90-dd9f" type="equalTo"/>
+                            <condition type="equalTo" value="0" field="selections" scope="parent" childId="449c-55ae-d56b-3514" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                           </conditions>
                         </conditionGroup>
                       </conditionGroups>
@@ -11888,36 +11895,6 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
         </modifierGroup>
       </modifierGroups>
       <infoLinks>
-        <infoLink id="0c4c-4073-4c68-23bf" name="Rampage (X)" hidden="true" targetId="3efb-2a2c-2d0b-92fc" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="false">
-              <conditionGroups>
-                <conditionGroup type="and">
-                  <conditions>
-                    <condition type="equalTo" value="1" field="selections" scope="03be-5d55-d05a-771d" childId="6d79-a3e4-381f-7b0f" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                    <condition type="equalTo" value="1" field="selections" scope="force" childId="20d9-ae98-5324-6bb3" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                    <condition type="equalTo" value="1" field="selections" scope="03be-5d55-d05a-771d" childId="f9fa-5b63-3545-01ba" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-            <modifier type="set" field="name" value="Rampage (2)"/>
-          </modifiers>
-        </infoLink>
-        <infoLink id="da3b-732c-9eac-af15" name="Outflank" hidden="false" targetId="bfbf-e75c-49a2-0285" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="03be-5d55-d05a-771d" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9fa-5b63-3545-01ba" type="equalTo"/>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="20d9-ae98-5324-6bb3" type="equalTo"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
-        </infoLink>
         <infoLink id="5e53-c0c3-7d02-131d" name="Legiones Hereticus (Emperor’s Children)" hidden="false" targetId="b9e-b2ef-86e-e52d" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -12204,6 +12181,37 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                 <modifier type="set" field="name" value="Fear (1)"/>
               </modifiers>
             </infoLink>
+            <infoLink name="Rampage (X)" id="bd34-ab25-a520-d197" hidden="true" targetId="3efb-2a2c-2d0b-92fc" type="rule">
+              <modifiers>
+                <modifier type="set" value="true" field="hidden">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition type="equalTo" value="0" field="selections" scope="03be-5d55-d05a-771d" childId="f9fa-5b63-3545-01ba" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="equalTo" value="0" field="selections" scope="force" childId="20d9-ae98-5324-6bb3" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="notInstanceOf" value="1" field="selections" scope="03be-5d55-d05a-771d" childId="6d79-a3e4-381f-7b0f" shared="true" includeChildSelections="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+                <modifier type="set" value="Rampage (2)" field="name"/>
+              </modifiers>
+            </infoLink>
+            <infoLink name="Outflank" id="29a0-82ee-3598-07cd" hidden="false" targetId="bfbf-e75c-49a2-0285" type="rule">
+              <modifiers>
+                <modifier type="set" value="true" field="hidden">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition type="equalTo" value="0" field="selections" scope="03be-5d55-d05a-771d" childId="f9fa-5b63-3545-01ba" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="equalTo" value="0" field="selections" scope="force" childId="20d9-ae98-5324-6bb3" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="notInstanceOf" value="1" field="selections" scope="03be-5d55-d05a-771d" childId="6d79-a3e4-381f-7b0f" shared="true" includeChildSelections="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+              </modifiers>
+            </infoLink>
           </infoLinks>
           <categoryLinks>
             <categoryLink id="3ff3-a875-b665-d9c2" name="Independent Character" hidden="false" targetId="4f07-3d45-4f28-a0c6" primary="false"/>
@@ -12839,8 +12847,16 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                         <conditionGroup type="and">
                           <conditions>
                             <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                            <condition type="equalTo" value="0" field="selections" scope="unit" childId="e78d-8c3a-e32d-1b10" shared="true"/>
                           </conditions>
+                          <conditionGroups>
+                            <conditionGroup type="and">
+                              <conditions>
+                                <condition type="equalTo" value="0" field="selections" scope="force" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="03be-5d55-d05a-771d" childId="fd55-9459-b3b3-5d20" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="03be-5d55-d05a-771d" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
+                              </conditions>
+                            </conditionGroup>
+                          </conditionGroups>
                         </conditionGroup>
                       </conditionGroups>
                     </modifier>
@@ -13539,8 +13555,16 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                         <conditionGroup type="and">
                           <conditions>
                             <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                            <condition type="equalTo" value="0" field="selections" scope="unit" childId="e78d-8c3a-e32d-1b10" shared="true"/>
                           </conditions>
+                          <conditionGroups>
+                            <conditionGroup type="and">
+                              <conditions>
+                                <condition type="equalTo" value="0" field="selections" scope="1b79-1951-5a63-4b9e" childId="fd55-9459-b3b3-5d20" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="force" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="1b79-1951-5a63-4b9e" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
+                              </conditions>
+                            </conditionGroup>
+                          </conditionGroups>
                         </conditionGroup>
                       </conditionGroups>
                     </modifier>
@@ -14053,15 +14077,7 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                   </costs>
                 </entryLink>
                 <entryLink id="34a2-6fa3-3fda-757f" name="Jarl" hidden="false" collective="false" import="true" targetId="4606-34cf-86b7-fb89" type="selectionEntry"/>
-                <entryLink id="a6b9-fca9-ab9c-58c1" name="Iron-Father" hidden="false" collective="false" import="true" targetId="4655-4447-299c-8fe2" 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="bfc9-c99c-bf8a-3917" type="equalTo"/>
-                      </conditions>
-                    </modifier>
-                  </modifiers>
-                </entryLink>
+                <entryLink id="a6b9-fca9-ab9c-58c1" name="Iron-Father" hidden="false" collective="false" import="true" targetId="4655-4447-299c-8fe2" type="selectionEntry"/>
                 <entryLink id="590f-818e-348d-4a4e" name="Berserker" hidden="true" collective="false" import="true" targetId="93af-e204-255b-b095" type="selectionEntry">
                   <modifiers>
                     <modifier type="set" value="false" field="hidden">
@@ -14069,8 +14085,16 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                         <conditionGroup type="and">
                           <conditions>
                             <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                            <condition type="equalTo" value="0" field="selections" scope="unit" childId="e78d-8c3a-e32d-1b10" shared="true"/>
                           </conditions>
+                          <conditionGroups>
+                            <conditionGroup type="and">
+                              <conditions>
+                                <condition type="equalTo" value="0" field="selections" scope="3760-204e-444c-1044" childId="fd55-9459-b3b3-5d20" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="force" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="3760-204e-444c-1044" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
+                              </conditions>
+                            </conditionGroup>
+                          </conditionGroups>
                         </conditionGroup>
                       </conditionGroups>
                     </modifier>
@@ -14517,56 +14541,6 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
         <constraint field="selections" scope="parent" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7e1a-0f0a-6d7f-1f19" type="min"/>
       </constraints>
       <infoLinks>
-        <infoLink id="5e6c-bc4c-3c23-15d2" name="Outflank" hidden="false" targetId="bfbf-e75c-49a2-0285" type="rule">
-          <modifiers>
-            <modifier type="set" field="hidden" value="true">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="25a2-7a52-632a-6b2c" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9fa-5b63-3545-01ba" type="equalTo"/>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="20d9-ae98-5324-6bb3" type="equalTo"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
-        </infoLink>
-        <infoLink id="7d02-80b0-d4e8-acf9" name="Rampage (X)" hidden="false" targetId="3efb-2a2c-2d0b-92fc" type="rule">
-          <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="true" includeChildForces="false" childId="20d9-ae98-5324-6bb3" type="equalTo"/>
-                  </conditions>
-                  <conditionGroups>
-                    <conditionGroup type="or">
-                      <conditions>
-                        <condition field="selections" scope="25a2-7a52-632a-6b2c" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9fa-5b63-3545-01ba" type="equalTo"/>
-                        <condition field="selections" scope="25a2-7a52-632a-6b2c" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6d79-a3e4-381f-7b0f" type="equalTo"/>
-                      </conditions>
-                    </conditionGroup>
-                  </conditionGroups>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-            <modifier type="set" field="name" value="Rampage (2)"/>
-          </modifiers>
-        </infoLink>
-        <infoLink id="1249-0883-9224-2914" name="Stubborn" hidden="false" targetId="7989-1f2c-a43d-82ae" type="rule">
-          <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="true" includeChildForces="false" childId="7a4d-26dd-c703-2723" type="equalTo"/>
-                    <condition field="selections" scope="25a2-7a52-632a-6b2c" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2d37-e793-bc77-37de" type="equalTo"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
-        </infoLink>
         <infoLink id="1e34-7d1-a1f3-bcf5" name="Legiones Hereticus (Emperor’s Children)" hidden="false" targetId="b9e-b2ef-86e-e52d" type="rule"/>
       </infoLinks>
       <selectionEntries>
@@ -15035,6 +15009,51 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                 <modifier type="set" field="name" value="Fear (1)"/>
               </modifiers>
             </infoLink>
+            <infoLink name="Stubborn" id="1249-0883-9224-2914" hidden="false" targetId="7989-1f2c-a43d-82ae" type="rule">
+              <modifiers>
+                <modifier type="set" value="true" field="hidden">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition type="equalTo" value="0" field="selections" scope="force" childId="7a4d-26dd-c703-2723" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="2d37-e793-bc77-37de" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+              </modifiers>
+            </infoLink>
+            <infoLink name="Rampage (X)" id="7d02-80b0-d4e8-acf9" hidden="false" targetId="3efb-2a2c-2d0b-92fc" type="rule">
+              <modifiers>
+                <modifier type="set" value="true" field="hidden">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition type="equalTo" value="0" field="selections" scope="force" childId="20d9-ae98-5324-6bb3" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="f9fa-5b63-3545-01ba" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="notInstanceOf" value="1" field="selections" scope="25a2-7a52-632a-6b2c" childId="6d79-a3e4-381f-7b0f" shared="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+                <modifier type="set" value="Rampage (2)" field="name"/>
+              </modifiers>
+            </infoLink>
+            <infoLink name="Outflank" id="5e6c-bc4c-3c23-15d2" hidden="false" targetId="bfbf-e75c-49a2-0285" type="rule">
+              <modifiers>
+                <modifier type="set" value="true" field="hidden">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="f9fa-5b63-3545-01ba" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="equalTo" value="0" field="selections" scope="force" childId="20d9-ae98-5324-6bb3" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <condition type="notInstanceOf" value="1" field="selections" scope="25a2-7a52-632a-6b2c" childId="6d79-a3e4-381f-7b0f" shared="true"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+              </modifiers>
+            </infoLink>
           </infoLinks>
           <categoryLinks>
             <categoryLink id="c616-84d4-9f5c-db27" name="Independent Character" hidden="false" targetId="4f07-3d45-4f28-a0c6" primary="false"/>
@@ -16186,10 +16205,21 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                       <conditionGroups>
                         <conditionGroup type="and">
                           <conditions>
-                            <condition field="selections" scope="25a2-7a52-632a-6b2c" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8846-2f93-a2be-18dc" type="equalTo"/>
                             <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="90ee-77dd-1b7f-ddfe" type="equalTo"/>
-                            <condition field="selections" scope="25a2-7a52-632a-6b2c" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d332-0e64-7ecf-6c35" type="equalTo"/>
                           </conditions>
+                          <conditionGroups>
+                            <conditionGroup type="and">
+                              <conditions>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="8846-2f93-a2be-18dc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="d332-0e64-7ecf-6c35" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="d71e-10a6-216f-d796" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="force" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="b625-1cef-3057-156c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="4e1a-275e-e691-5b92" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="25a2-7a52-632a-6b2c" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
+                              </conditions>
+                            </conditionGroup>
+                          </conditionGroups>
                         </conditionGroup>
                       </conditionGroups>
                     </modifier>
@@ -24818,8 +24848,8 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e8a8-b526-beab-bb82" type="equalTo"/>
-                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6fb4-adf6-dbe8-86af" type="equalTo"/>
+                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e8a8-b526-beab-bb82" type="equalTo"/>
+                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6fb4-adf6-dbe8-86af" type="equalTo"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -24891,8 +24921,8 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e8a8-b526-beab-bb82" type="equalTo"/>
-                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6fb4-adf6-dbe8-86af" type="equalTo"/>
+                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e8a8-b526-beab-bb82" type="equalTo"/>
+                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6fb4-adf6-dbe8-86af" type="equalTo"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -25544,8 +25574,8 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e8a8-b526-beab-bb82" type="equalTo"/>
-                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6fb4-adf6-dbe8-86af" type="equalTo"/>
+                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e8a8-b526-beab-bb82" type="equalTo"/>
+                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6fb4-adf6-dbe8-86af" type="equalTo"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -25627,8 +25657,8 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                   <conditionGroups>
                     <conditionGroup type="or">
                       <conditions>
-                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e8a8-b526-beab-bb82" type="equalTo"/>
-                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6fb4-adf6-dbe8-86af" type="equalTo"/>
+                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e8a8-b526-beab-bb82" type="equalTo"/>
+                        <condition field="selections" scope="0aca-632d-1642-8af9" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6fb4-adf6-dbe8-86af" type="equalTo"/>
                       </conditions>
                     </conditionGroup>
                   </conditionGroups>
@@ -26936,10 +26966,20 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                       <conditionGroups>
                         <conditionGroup type="and">
                           <conditions>
-                            <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="8846-2f93-a2be-18dc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                             <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                            <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="d332-0e64-7ecf-6c35" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                           </conditions>
+                          <conditionGroups>
+                            <conditionGroup type="and">
+                              <conditions>
+                                <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="8846-2f93-a2be-18dc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="d332-0e64-7ecf-6c35" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="d71e-10a6-216f-d796" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="force" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="b625-1cef-3057-156c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
+                              </conditions>
+                            </conditionGroup>
+                          </conditionGroups>
                         </conditionGroup>
                       </conditionGroups>
                     </modifier>
@@ -27681,51 +27721,60 @@ If one or more Wounds is discounted due to this special rule, and the unit that
       <infoLinks>
         <infoLink id="18b6-f65d-5d60-d317" name="Relentless" hidden="false" targetId="7adf-ac9a-5035-522d" type="rule"/>
         <infoLink id="297d-7e23-67dd-a0e5" name="Chosen Warriors" hidden="false" targetId="13d1-9270-6539-08ed" type="rule"/>
-        <infoLink id="1130-c645-4acc-5f89" name="Heart of the Legion" hidden="true" targetId="c0dd-9002-2ebd-f96d" type="rule">
+        <infoLink id="1130-c645-4acc-5f89" name="Heart of the Legion" hidden="false" targetId="c0dd-9002-2ebd-f96d" type="rule">
           <modifiers>
-            <modifier type="set" field="hidden" value="false">
+            <modifier type="set" field="hidden" value="true">
               <conditionGroups>
                 <conditionGroup type="or">
                   <conditions>
-                    <condition type="atLeast" value="1" field="selections" scope="force" childId="06cc-c559-d71e-b75e" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                    <condition type="atLeast" value="1" field="selections" scope="a423-7dd8-3f1b-3e28" childId="64e9-c749-f596-402a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                    <condition type="equalTo" value="0" field="selections" scope="force" childId="06cc-c559-d71e-b75e" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                    <condition type="equalTo" value="0" field="selections" scope="a423-7dd8-3f1b-3e28" childId="64e9-c749-f596-402a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
             </modifier>
-            <modifier type="set" value="false" field="hidden">
+          </modifiers>
+        </infoLink>
+        <infoLink id="b685-692b-2848-d264" name="Outflank" hidden="false" targetId="bfbf-e75c-49a2-0285" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
               <conditionGroups>
-                <conditionGroup type="and">
+                <conditionGroup type="or">
                   <conditions>
-                    <condition type="atLeast" value="1" field="selections" scope="a423-7dd8-3f1b-3e28" childId="f35f-d680-53a4-c49c" shared="true" includeChildSelections="true"/>
-                    <condition type="equalTo" value="0" field="selections" scope="force" childId="3191-274c-d0df-bb4f" shared="true" includeChildSelections="true"/>
+                    <condition field="selections" scope="a423-7dd8-3f1b-3e28" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9fa-5b63-3545-01ba" type="equalTo"/>
+                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="20d9-ae98-5324-6bb3" type="equalTo"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
             </modifier>
           </modifiers>
         </infoLink>
-        <infoLink id="b685-692b-2848-d264" name="Outflank" hidden="false" targetId="bfbf-e75c-49a2-0285" type="rule">
+        <infoLink id="24b0-509b-276-e22a" name="Legiones Hereticus (Emperor’s Children)" hidden="false" targetId="b9e-b2ef-86e-e52d" type="rule"/>
+        <infoLink name="Fury of the Legion" id="9128-79b3-a9a3-a8f7" hidden="false" type="rule" targetId="56e4-5bbb-91bd-13e0">
           <modifiers>
-            <modifier type="set" field="hidden" value="true">
+            <modifier type="set" value="true" field="hidden">
               <conditionGroups>
                 <conditionGroup type="or">
                   <conditions>
-                    <condition field="selections" scope="a423-7dd8-3f1b-3e28" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9fa-5b63-3545-01ba" type="equalTo"/>
-                    <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="20d9-ae98-5324-6bb3" type="equalTo"/>
+                    <condition type="equalTo" value="0" field="selections" scope="a423-7dd8-3f1b-3e28" childId="f35f-d680-53a4-c49c" shared="true" includeChildSelections="true"/>
+                    <condition type="equalTo" value="1" field="selections" scope="force" childId="3191-274c-d0df-bb4f" shared="true" includeChildSelections="true"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
             </modifier>
           </modifiers>
         </infoLink>
-        <infoLink id="24b0-509b-276-e22a" name="Legiones Hereticus (Emperor’s Children)" hidden="false" targetId="b9e-b2ef-86e-e52d" type="rule"/>
-        <infoLink name="Fury of the Legion" id="9128-79b3-a9a3-a8f7" hidden="true" type="rule" targetId="56e4-5bbb-91bd-13e0">
+        <infoLink name="Heart of the Legion" id="e67c-e501-a5b8-5ab0" hidden="false" targetId="c0dd-9002-2ebd-f96d" type="rule">
           <modifiers>
-            <modifier type="set" value="false" field="hidden">
-              <conditions>
-                <condition type="atLeast" value="1" field="selections" scope="a423-7dd8-3f1b-3e28" childId="f35f-d680-53a4-c49c" shared="true" includeChildSelections="true"/>
-              </conditions>
+            <modifier type="set" value="true" field="hidden">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="equalTo" value="0" field="selections" scope="a423-7dd8-3f1b-3e28" childId="f35f-d680-53a4-c49c" shared="true" includeChildSelections="true"/>
+                    <condition type="equalTo" value="1" field="selections" scope="force" childId="3191-274c-d0df-bb4f" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
             </modifier>
           </modifiers>
         </infoLink>
@@ -29398,6 +29447,11 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                         </modifier>
                       </modifiers>
                     </entryLink>
+                    <entryLink import="true" name="Minor Combi-Weapon - Alchem Flamer" hidden="false" id="d442-c157-6ae0-28c1" collective="false" targetId="b941-687c-c95e-31a6" type="selectionEntry">
+                      <costs>
+                        <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
+                      </costs>
+                    </entryLink>
                   </entryLinks>
                   <modifiers>
                     <modifier type="set" value="533f-7a1c-adfb-afe4" field="defaultSelectionEntryId">
@@ -32871,10 +32925,20 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                       <conditionGroups>
                         <conditionGroup type="and">
                           <conditions>
-                            <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="8846-2f93-a2be-18dc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                             <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                            <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="d332-0e64-7ecf-6c35" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                           </conditions>
+                          <conditionGroups>
+                            <conditionGroup type="and">
+                              <conditions>
+                                <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="d332-0e64-7ecf-6c35" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="d71e-10a6-216f-d796" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="8846-2f93-a2be-18dc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="force" childId="21c3-2f28-7820-e51a" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="b625-1cef-3057-156c" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                                <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
+                              </conditions>
+                            </conditionGroup>
+                          </conditionGroups>
                         </conditionGroup>
                       </conditionGroups>
                     </modifier>
@@ -43523,6 +43587,11 @@ It is not known if this is a mistake or not, as previously like with the Mech bo
                   </costs>
                 </entryLink>
                 <entryLink id="a467-bac4-faef-ed63" name="Aether-shock Maul" hidden="false" collective="false" import="true" targetId="a696-4b44-8abe-771a" type="selectionEntry"/>
+                <entryLink import="true" name="Solarite Power Gauntlet" hidden="false" id="abfd-f13e-be8f-ef29" collective="false" targetId="b682-2c89-f979-aa74" type="selectionEntry">
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
@@ -43693,6 +43762,11 @@ It is not known if this is a mistake or not, as previously like with the Mech bo
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                   </costs>
                 </entryLink>
+                <entryLink import="true" name="Solarite Power Gauntlet" hidden="false" id="5ea8-872e-29f5-c73b" collective="false" targetId="b682-2c89-f979-aa74" type="selectionEntry">
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
             </selectionEntryGroup>
             <selectionEntryGroup id="f89d-d495-f16a-38eb" name="Ranged Options" hidden="false" collective="false" import="true" defaultSelectionEntryId="548a-2e7a-82fa-6216">
@@ -55851,6 +55925,11 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
                     </modifier>
                   </modifiers>
                 </entryLink>
+                <entryLink import="true" name="Solarite Power Gauntlet" hidden="false" id="60e0-cd61-6cbd-097f" collective="false" targetId="b682-2c89-f979-aa74" type="selectionEntry">
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="20"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
               <selectionEntries>
                 <selectionEntry type="upgrade" import="true" name="Xenos Doomlock" hidden="true" id="ebda-e441-875d-2187" publicationId="d882-d2a-5da1-92c4" sortIndex="18">
@@ -59732,7 +59811,6 @@ Additionally, at the end of any Phase in which a model with Gorgon Terminator ar
             <conditionGroup type="and">
               <conditions>
                 <condition type="equalTo" value="1" field="selections" scope="force" childId="bfc9-c99c-bf8a-3917" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-                <condition type="equalTo" value="0" field="selections" scope="force" childId="ae4a-f95c-968e-eb46" shared="true" includeChildSelections="true"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -62060,6 +62138,15 @@ Invulnerable saves granted by a combat shield or boarding shield do not stack wi
                 </conditionGroup>
               </conditionGroups>
             </modifier>
+            <modifier type="append" value="(Corrupted)" field="ddd7-6f5c-a939-b69e">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="equalTo" value="1" field="selections" scope="dad1-0807-e254-d498" childId="555f-3998-a06e-f415" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
           </modifiers>
           <characteristics>
             <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Dreadnought (Character)</characteristic>
@@ -62099,6 +62186,68 @@ Invulnerable saves granted by a combat shield or boarding shield do not stack wi
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
               </costs>
             </entryLink>
+            <entryLink import="true" name="Surgical Augment" hidden="true" id="66ed-59dd-189a-f254" collective="false" targetId="ffa3-1a57-1eb4-1818" type="selectionEntryGroup"/>
+            <entryLink import="true" name="Trophies of Judgement" hidden="false" id="8088-eebf-d24d-b3f4" collective="false" targetId="bde7-7c77-5973-cd52" type="selectionEntry">
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="54d4-4797-d7fc-eccf" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+              <costs>
+                <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+              </costs>
+            </entryLink>
+            <entryLink import="true" name="Dark Channeling" hidden="false" id="7970-501c-c506-018d" collective="false" targetId="555f-3998-a06e-f415" 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="9dbf-0760-d7ae-f125" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                        <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>
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="8d9a-b828-a482-ede4" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </constraints>
+              <costs>
+                <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="25"/>
+              </costs>
+            </entryLink>
+            <entryLink import="true" name="Power Dagger" hidden="false" id="fb2d-2252-0717-f228" collective="false" targetId="8157-b77c-0dd3-85b2" type="selectionEntry">
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3e8f-ed30-ab30-6a25" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+              <costs>
+                <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
+              </costs>
+            </entryLink>
+            <entryLink import="true" name="Venom Spheres" hidden="false" id="6de3-d4f7-21ee-4fc3" collective="false" targetId="82f5-cca1-51a0-31dd" type="selectionEntry">
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="b621-712f-6c0e-5803" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+              <costs>
+                <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+              </costs>
+            </entryLink>
+            <entryLink import="true" name="Toxin Bombs" hidden="false" id="b851-8b00-01dd-9d69" collective="false" targetId="987b-9177-dde0-bf9b" type="selectionEntry">
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="5ed7-61b6-2fca-6cd0" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+              <costs>
+                <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+              </costs>
+            </entryLink>
+            <entryLink import="true" name="Debased Augments" hidden="true" id="7286-73c1-82f9-902e" type="selectionEntryGroup" targetId="a819-94e-c873-8a35"/>
+            <entryLink import="true" name="Infravisor" hidden="false" id="d9bf-ce90-138b-fcec" collective="false" targetId="bc5b-fcd7-aeed-e97c" type="selectionEntry">
+              <constraints>
+                <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="cec8-3627-e05b-ad40" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </constraints>
+              <costs>
+                <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+              </costs>
+            </entryLink>
           </entryLinks>
         </selectionEntryGroup>
         <selectionEntryGroup id="a1d7-ea81-ff10-8039" name="1) Weapon Option 1" hidden="false" collective="false" import="true" defaultSelectionEntryId="3ba0-9c58-1778-9454">
@@ -63409,6 +63558,7 @@ If the Psychic check is successful then until that Shooting Attack is resolved,
                         <conditionGroup type="and">
                           <conditions>
                             <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                            <condition type="equalTo" value="0" field="selections" scope="5585-b5f3-4640-894b" childId="ef1b-65a4-e516-99d3" shared="true" includeChildSelections="true"/>
                           </conditions>
                         </conditionGroup>
                       </conditionGroups>
@@ -64259,6 +64409,24 @@ If the Psychic check is successful then until that Shooting Attack is resolved,
                     <modifier type="set" value="2) Extra Melee Weapon:" field="name"/>
                   </modifiers>
                 </entryLink>
+                <entryLink import="true" name="Augury Scanner" hidden="false" id="30e0-f5d7-bf64-5748" type="selectionEntry" targetId="67ee-7338-3b74-04b4">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="ef84-7a25-9bbb-11aa" includeChildSelections="false"/>
+                    <constraint type="max" value="1" field="selections" scope="d42c-e6ff-d976-54bc" shared="true" id="05af-1e2b-8051-dc86" includeChildSelections="true"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                  </costs>
+                </entryLink>
+                <entryLink import="true" name="Nuncio-Vox" hidden="false" id="6887-bb1d-94a7-2d5b" type="selectionEntry" targetId="005e-aae6-ddac-bb45">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="b059-a209-af3c-d86c" includeChildSelections="false"/>
+                    <constraint type="max" value="1" field="selections" scope="d42c-e6ff-d976-54bc" shared="true" id="1a86-c714-6998-5653" includeChildSelections="true"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
               <modifierGroups>
                 <modifierGroup type="and">
@@ -64288,11 +64456,47 @@ If the Psychic check is successful then until that Shooting Attack is resolved,
             <entryLink import="true" name="Veteran" hidden="false" id="ca20-bf78-a33a-b847" type="selectionEntry" targetId="8478-e21f-bc94-e0e0">
               <entryLinks>
                 <entryLink targetId="e661-59ac-a171-9382" id="afc7-c81c-5b35-4ae4" type="selectionEntryGroup" name="Banner Option (1 model/squad):" hidden="false"/>
+                <entryLink import="true" name="Augury Scanner" hidden="false" id="f440-56c8-397d-5913" type="selectionEntry" targetId="67ee-7338-3b74-04b4">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="e97c-e878-717e-1df0" includeChildSelections="false"/>
+                    <constraint type="max" value="1" field="selections" scope="d42c-e6ff-d976-54bc" shared="true" id="f961-2a6a-1c53-fafb" includeChildSelections="true"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                  </costs>
+                </entryLink>
+                <entryLink import="true" name="Nuncio-Vox" hidden="false" id="6d29-257e-6896-0596" type="selectionEntry" targetId="005e-aae6-ddac-bb45">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="30c9-003f-480d-cede" includeChildSelections="false"/>
+                    <constraint type="max" value="1" field="selections" scope="d42c-e6ff-d976-54bc" shared="true" id="cc83-c357-a437-035c" includeChildSelections="true"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
             </entryLink>
             <entryLink import="true" name="Veteran w/Lightning Claws" hidden="false" id="7d65-827e-e2a5-fc5b" type="selectionEntry" targetId="8fac-9521-1613-b322">
               <entryLinks>
                 <entryLink import="true" name="Banner Option (1 model/squad):" hidden="false" id="4208-98ff-b524-1f34" targetId="e661-59ac-a171-9382" type="selectionEntryGroup"/>
+                <entryLink import="true" name="Augury Scanner" hidden="false" id="a060-e2b6-72a7-d55b" type="selectionEntry" targetId="67ee-7338-3b74-04b4">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="ae8e-8fa7-e8d4-8afa" includeChildSelections="false"/>
+                    <constraint type="max" value="1" field="selections" scope="d42c-e6ff-d976-54bc" shared="true" id="d85f-9692-0fab-b066" includeChildSelections="true"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                  </costs>
+                </entryLink>
+                <entryLink import="true" name="Nuncio-Vox" hidden="false" id="0d53-8281-8811-732d" type="selectionEntry" targetId="005e-aae6-ddac-bb45">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="f1b6-f167-b6db-b1f0" includeChildSelections="false"/>
+                    <constraint type="max" value="1" field="selections" scope="d42c-e6ff-d976-54bc" shared="true" id="47ba-f534-123c-0aeb" includeChildSelections="true"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
             </entryLink>
           </entryLinks>
@@ -66189,6 +66393,7 @@ While making a Chain Fire attack, a model with this special rule may make up to
                     <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0df-c1fa-5ddc-9ee5" type="equalTo"/>
                     <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b5b7-3410-a8e5-95a6" type="equalTo"/>
                     <condition type="equalTo" value="0" field="selections" scope="force" childId="ae4a-f95c-968e-eb46" shared="true" includeChildSelections="true"/>
+                    <condition type="instanceOf" value="0" field="selections" scope="ancestor" childId="25a2-7a52-632a-6b2c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
                   </conditions>
                 </conditionGroup>
               </conditionGroups>
@@ -66258,6 +66463,13 @@ Any Solar Auxilia Rifles Sections included through the use of the Overseer’s R
 * Note that rules for these units are found in the Warhammer: The Horus Heresy – Liber Imperium book or the Legacies of the Age of Darkness: the Imperialis Militia army list.</description>
             </rule>
           </rules>
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <conditions>
+                <condition type="notInstanceOf" value="0" field="selections" scope="ancestor" childId="25a2-7a52-632a-6b2c" shared="true" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+              </conditions>
+            </modifier>
+          </modifiers>
         </selectionEntry>
       </selectionEntries>
       <infoLinks>
diff --git a/2022 - Mech Library.cat b/2022 - Mech Library.cat
index 00d84cd8..9d556887 100644
--- a/2022 - Mech Library.cat	
+++ b/2022 - Mech Library.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="3129-da35-55e0-642d" name="Mech Library" revision="46" battleScribeVersion="2.03" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="3129-da35-55e0-642d" name="Mech Library" revision="47" battleScribeVersion="2.03" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <categoryEntries>
     <categoryEntry id="4086-0589-f010-e688" name="Titan Legion Min Troop/LoW" hidden="false"/>
     <categoryEntry id="57a1-ae47-ff1b-36e4" name="Cybertheurgist" publicationId="bde1-6db1-163b-3b76" page="92-96" hidden="false"/>
@@ -4327,6 +4327,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da46-48b5-6cc5-9d8b" type="equalTo"/>
               </conditions>
             </modifier>
+            <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="537f-846d-90e3-2526" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1d43-7c11-b7e5-7ae9" type="min"/>
@@ -4345,6 +4350,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
                     <condition field="selections" scope="ab78-91e2-bb5c-9da3" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc2a-46fe-bbf3-6ba2" type="equalTo"/>
                   </conditions>
                 </modifier>
+                <modifier type="set" value="Automata (Paragon)" field="ddd7-6f5c-a939-b69e">
+                  <conditions>
+                    <condition type="atLeast" value="1" field="selections" scope="537f-846d-90e3-2526" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </modifier>
               </modifiers>
               <characteristics>
                 <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Automata (Cybernetica)</characteristic>
@@ -4577,6 +4587,13 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
       </costs>
+      <modifiers>
+        <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="537f-846d-90e3-2526" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="6f3d-9a42-da1d-2c2e" name="Darkfire Cannon" publicationId="bde1-6db1-163b-3b76" page="117" hidden="false" collective="false" import="true" type="upgrade">
       <profiles>
@@ -4674,6 +4691,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da46-48b5-6cc5-9d8b" type="equalTo"/>
               </conditions>
             </modifier>
+            <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="1a1b-fa35-a6a2-ca78" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2116-a161-c40f-7ec0" type="min"/>
@@ -4692,6 +4714,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
                     <condition field="selections" scope="200f-3379-95a3-c3a4" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc2a-46fe-bbf3-6ba2" type="equalTo"/>
                   </conditions>
                 </modifier>
+                <modifier type="set" value="Automata (Paragon)" field="ddd7-6f5c-a939-b69e">
+                  <conditions>
+                    <condition type="atLeast" value="1" field="selections" scope="1a1b-fa35-a6a2-ca78" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </modifier>
               </modifiers>
               <characteristics>
                 <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Automata (Cybernetica)</characteristic>
@@ -4802,6 +4829,13 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
       </costs>
+      <modifiers>
+        <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="1a1b-fa35-a6a2-ca78" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="ceaa-178d-3995-c2c8" name="Graviton Hammer" publicationId="bde1-6db1-163b-3b76" page="116" hidden="false" collective="false" import="true" type="upgrade">
       <profiles>
@@ -4991,6 +5025,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
             <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da46-48b5-6cc5-9d8b" type="equalTo"/>
           </conditions>
         </modifier>
+        <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="cfe3-874c-01db-9e29" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="force" value="-1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="ed02-9ebb-5829-d554" type="max"/>
@@ -5059,6 +5098,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
                             <condition field="selections" scope="2903-fef6-e839-368b" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc2a-46fe-bbf3-6ba2" type="equalTo"/>
                           </conditions>
                         </modifier>
+                        <modifier type="set" value="Automata (Paragon, Heavy)" field="ddd7-6f5c-a939-b69e">
+                          <conditions>
+                            <condition type="atLeast" value="1" field="selections" scope="2903-fef6-e839-368b" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+                          </conditions>
+                        </modifier>
                       </modifiers>
                       <characteristics>
                         <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Automata (Cybernetica, Heavy)</characteristic>
@@ -5137,6 +5181,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
                             <condition field="selections" scope="2903-fef6-e839-368b" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc2a-46fe-bbf3-6ba2" type="equalTo"/>
                           </conditions>
                         </modifier>
+                        <modifier type="set" value="Automata (Paragon, Heavy)" field="ddd7-6f5c-a939-b69e">
+                          <conditions>
+                            <condition type="atLeast" value="1" field="selections" scope="2903-fef6-e839-368b" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+                          </conditions>
+                        </modifier>
                       </modifiers>
                       <characteristics>
                         <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Automata (Cybernetica, Heavy)</characteristic>
@@ -5286,6 +5335,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
                 <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="da46-48b5-6cc5-9d8b" type="equalTo"/>
               </conditions>
             </modifier>
+            <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="f144-1079-11ff-019d" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ade9-d7ad-8024-68dc" type="min"/>
@@ -5304,6 +5358,11 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
                     <condition field="selections" scope="f144-1079-11ff-019d" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc2a-46fe-bbf3-6ba2" type="equalTo"/>
                   </conditions>
                 </modifier>
+                <modifier type="set" value="Automata (Paragon, Light)" field="ddd7-6f5c-a939-b69e">
+                  <conditions>
+                    <condition type="atLeast" value="1" field="selections" scope="f144-1079-11ff-019d" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </modifier>
               </modifiers>
               <characteristics>
                 <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Automata (Cybernetica, Light)</characteristic>
@@ -5462,6 +5521,13 @@ Invulnerable Saves granted by a mag-inverter shield do not stack with other Invu
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
       </costs>
+      <modifiers>
+        <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="f144-1079-11ff-019d" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="1d6f-970d-3b89-7886" name="Avenger Gatling Cannon with In-Built Heavy Flamer" hidden="false" collective="false" import="true" type="upgrade">
       <infoLinks>
diff --git a/2022 - Mechanicum.cat b/2022 - Mechanicum.cat
index f20681a6..3e4f64a3 100644
--- a/2022 - Mechanicum.cat	
+++ b/2022 - Mechanicum.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="c247-da79-1654-d39e" name="Mechanicum" revision="41" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue" publicationId="3886-76e5-438f-159f">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="c247-da79-1654-d39e" name="Mechanicum" revision="42" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue" publicationId="3886-76e5-438f-159f">
   <entryLinks>
     <entryLink id="29c6-0ec7-0162-e817" name="Mechanicum" hidden="false" collective="false" import="false" targetId="ddf5-d792-3146-6e9a" type="selectionEntry">
       <modifiers>
@@ -261,13 +261,6 @@
       </categoryLinks>
     </entryLink>
     <entryLink id="60ea-7150-b6b9-7b9b" name="Thanatar Siege-automata Maniple" hidden="false" collective="false" import="false" targetId="2903-fef6-e839-368b" type="selectionEntry">
-      <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7b69-bf2f-4547-e83b" type="atLeast"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <categoryLinks>
         <categoryLink id="9d6b-f8e9-44a9-9974" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
         <categoryLink id="b283-74d2-92e1-5d80" name="Heavy Support:" hidden="false" targetId="7031-469a-1aeb-eab0" primary="true"/>
@@ -342,14 +335,9 @@
     <entryLink id="d1c5-ff4b-1a9e-2a92" name="Thanatar Siege-automata Maniple" hidden="true" collective="false" import="false" targetId="2903-fef6-e839-368b" type="selectionEntry">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
-          <conditionGroups>
-            <conditionGroup type="and">
-              <conditions>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7b69-bf2f-4547-e83b" type="equalTo"/>
-                <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8305-5ac6-f395-e570" type="greaterThan"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
+          <conditions>
+            <condition type="greaterThan" value="0" field="selections" scope="force" childId="8305-5ac6-f395-e570" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+          </conditions>
         </modifier>
       </modifiers>
       <categoryLinks>
@@ -501,9 +489,14 @@
     <entryLink id="75ab-47e9-3e7d-1fcb" name="Macrocarid Explorator" hidden="true" collective="false" import="false" targetId="bd83-b47d-1f37-1159" type="selectionEntry">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
-          <conditions>
-            <condition field="selections" scope="roster" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d344-d97b-4687-8a62" type="greaterThan"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition type="equalTo" value="0" field="selections" scope="force" childId="7b69-bf2f-4547-e83b" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                <condition type="greaterThan" value="0" field="selections" scope="roster" childId="d344-d97b-4687-8a62" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
@@ -3226,6 +3219,11 @@ This unit may be upgraded freely as described in their profile, though they may
                     <condition field="selections" scope="e713-beb2-95dd-51cb" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cc2a-46fe-bbf3-6ba2" type="equalTo"/>
                   </conditions>
                 </modifier>
+                <modifier type="set" value="Automata (Paragon)" field="ddd7-6f5c-a939-b69e">
+                  <conditions>
+                    <condition type="atLeast" value="1" field="selections" scope="b178-7d35-136f-d305" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </modifier>
               </modifiers>
               <characteristics>
                 <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Automata (Cybernetica)</characteristic>
@@ -3376,11 +3374,25 @@ This unit may be upgraded freely as described in their profile, though they may
             <categoryLink targetId="d8ab-8e21-e193-63ba" id="f653-f942-4a3b-9f77" name="Automata Unit Type" primary="false"/>
             <categoryLink targetId="2440-b64e-cb24-87f0" id="6b5a-a7c0-44ce-b384" name="Cybernetica Sub-type" primary="false"/>
           </categoryLinks>
+          <modifiers>
+            <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="b178-7d35-136f-d305" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
+          </modifiers>
         </selectionEntry>
       </selectionEntries>
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
       </costs>
+      <modifiers>
+        <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="b178-7d35-136f-d305" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="0750-2aed-2d36-8a82" name="Ursarax Cohort" publicationId="bde1-6db1-163b-3b76" page="41" hidden="false" collective="false" import="true" type="unit">
       <categoryLinks>
@@ -3544,6 +3556,11 @@ This unit may be upgraded freely as described in their profile, though they may
                     <condition field="selections" scope="c731-8052-ca8a-0b37" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="cc2a-46fe-bbf3-6ba2" type="equalTo"/>
                   </conditions>
                 </modifier>
+                <modifier type="set" value="Automata (Antigrav, Paragon)" field="ddd7-6f5c-a939-b69e">
+                  <conditions>
+                    <condition type="atLeast" value="1" field="selections" scope="b790-b6dc-b904-118c" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </modifier>
               </modifiers>
               <characteristics>
                 <characteristic name="Unit Type" typeId="ddd7-6f5c-a939-b69e">Automata (Antigrav, Cybernetica)</characteristic>
@@ -3632,11 +3649,25 @@ This unit may be upgraded freely as described in their profile, though they may
             <categoryLink targetId="4303-1348-cce4-9501" id="9970-338f-4b04-8d10" name="Antigrav Sub-type" primary="false"/>
             <categoryLink targetId="2440-b64e-cb24-87f0" id="52b3-8b0b-4a04-bb52" name="Cybernetica Sub-type" primary="false"/>
           </categoryLinks>
+          <modifiers>
+            <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="b790-b6dc-b904-118c" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+              </conditions>
+            </modifier>
+          </modifiers>
         </selectionEntry>
       </selectionEntries>
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
       </costs>
+      <modifiers>
+        <modifier type="remove" value="2440-b64e-cb24-87f0" field="category">
+          <conditions>
+            <condition type="atLeast" value="1" field="selections" scope="b790-b6dc-b904-118c" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
+          </conditions>
+        </modifier>
+      </modifiers>
     </selectionEntry>
     <selectionEntry id="356f-a88b-1d13-3700" name="Myrmidon Destructor Host" publicationId="bde1-6db1-163b-3b76" page="47" hidden="false" collective="false" import="true" type="unit">
       <categoryLinks>