diff --git a/2022 - Horus Heresy.gst b/2022 - Horus Heresy.gst
index 964d30d7..ff07f4ec 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="112" battleScribeVersion="2.03" type="gameSystem">
+<gameSystem xmlns="http://www.battlescribe.net/schema/gameSystemSchema" id="28d4-bd2e-4858-ece6" name="Horus Heresy (2022)" revision="113" 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"/>
@@ -7423,7 +7423,7 @@ Thaumaturge’s Cleansing (Psychic Weapon)</description>
       <constraints>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a7ae-8da7-ad16-cea6" type="max"/>
         <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="2c74-7db8-469e-8327" type="max"/>
-        <constraint field="selections" scope="roster" value="2" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="dadb-f5a9-20c8-f415" type="max"/>
+        <constraint field="selections" scope="roster" value="3" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="dadb-f5a9-20c8-f415" type="max"/>
       </constraints>
       <profiles>
         <profile id="9e5f-b65f-2f13-f24e" name="Advanced Reaction: Scornful Fire" publicationId="bde1-6db1-163b-3b76" page="17" hidden="false" typeId="90b9-7fab-87db-aed3" typeName="Reactions">
diff --git a/2022 - LA - Salamanders.cat b/2022 - LA - Salamanders.cat
index ff016c61..b7e2a50c 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="43" 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="44" 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>
@@ -5493,52 +5493,69 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7f9c-28ea-f4ad-90b6" type="min"/>
                   </constraints>
                   <entryLinks>
-                    <entryLink id="28c0-c6e1-4920-d751" name="Chainsword" hidden="false" collective="false" import="true" targetId="b5b7-b50a-ac86-9173" type="selectionEntry">
+                    <entryLink id="28c0-c6e1-4920-d751" name="Chainsword" hidden="false" collective="false" import="true" targetId="06e7-a6ae-ed1c-eb03" type="selectionEntry">
                       <constraints>
                         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="af41-5693-e6f4-3cc" type="max"/>
-                        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c80c-a3f1-5a60-619c" type="min"/>
                       </constraints>
                     </entryLink>
                   </entryLinks>
                   <selectionEntryGroups>
                     <selectionEntryGroup name="For Every Five Models, One May Exchange Chainsword for:" hidden="false" id="2632-6353-6235-cb07">
                       <entryLinks>
-                        <entryLink id="d56a-cf17-aa36-7ca8" name="Thunder Hammer" hidden="false" collective="false" import="true" targetId="b6ac-3ba5-90ae-67f7" type="selectionEntry">
+                        <entryLink id="d56a-cf17-aa36-7ca8" name="Thunder Hammer" hidden="false" collective="false" import="true" targetId="838c-4002-713d-d7c6" type="selectionEntry">
                           <costs>
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="25"/>
                           </costs>
+                          <constraints>
+                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="8174-6417-2954-69be"/>
+                          </constraints>
                         </entryLink>
-                        <entryLink id="39fd-3046-52f0-db9e" name="Power Sword" hidden="false" collective="false" import="true" targetId="fa06-cac0-3d98-125e" type="selectionEntry">
+                        <entryLink id="39fd-3046-52f0-db9e" name="Power Sword" hidden="false" collective="false" import="true" targetId="a3cd-aa97-a148-2309" type="selectionEntry">
                           <costs>
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                           </costs>
+                          <constraints>
+                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="4414-1528-0f7b-085d"/>
+                          </constraints>
                         </entryLink>
-                        <entryLink id="f93e-6bc8-1fe9-c7bc" name="Power Maul" hidden="false" collective="false" import="true" targetId="98e8-f217-dea9-0493" type="selectionEntry">
+                        <entryLink id="f93e-6bc8-1fe9-c7bc" name="Power Maul" hidden="false" collective="false" import="true" targetId="0df4-c67e-cf64-82e0" type="selectionEntry">
                           <costs>
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                           </costs>
+                          <constraints>
+                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="4c49-9efa-86bc-5724"/>
+                          </constraints>
                         </entryLink>
-                        <entryLink id="d009-f6d7-9e3a-b36a" name="Power Lance" hidden="false" collective="false" import="true" targetId="fca3-4ec1-c581-1ba3" type="selectionEntry">
+                        <entryLink id="d009-f6d7-9e3a-b36a" name="Power Lance" hidden="false" collective="false" import="true" targetId="a4c8-c8ff-87f2-1ac9" type="selectionEntry">
                           <costs>
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                           </costs>
+                          <constraints>
+                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="33b7-2c9d-04d6-27b6"/>
+                          </constraints>
                         </entryLink>
-                        <entryLink id="44df-47bb-4ede-7d8e" name="Power Axe" hidden="false" collective="false" import="true" targetId="ef98-66ac-fcaf-c15d" type="selectionEntry">
+                        <entryLink id="44df-47bb-4ede-7d8e" name="Power Axe" hidden="false" collective="false" import="true" targetId="c066-2ace-f68c-e440" type="selectionEntry">
                           <costs>
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                           </costs>
+                          <constraints>
+                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="1b54-fa1d-d957-1eee"/>
+                          </constraints>
                         </entryLink>
-                        <entryLink import="true" name="Chainaxe" hidden="false" type="selectionEntry" id="fda4-c725-ff44-43f8" targetId="e644-9e34-f513-5995">
+                        <entryLink import="true" name="Chainaxe" hidden="false" type="selectionEntry" id="fda4-c725-ff44-43f8" targetId="85b9-4e50-af11-c295">
                           <costs>
                             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                           </costs>
+                          <constraints>
+                            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="384a-73fd-4924-4405"/>
+                          </constraints>
                         </entryLink>
                       </entryLinks>
                       <constraints>
-                        <constraint type="max" value="0" field="selections" scope="parent" shared="true" id="24d0-f21-a600-d66a"/>
+                        <constraint type="max" value="0" field="selections" scope="3720-9b50-f599-76ea" shared="true" id="24d0-f21-a600-d66a" includeChildSelections="true"/>
                       </constraints>
                       <modifiers>
-                        <modifier type="set" value="0" field="24d0-f21-a600-d66a">
+                        <modifier type="increment" value="1" field="24d0-f21-a600-d66a">
                           <repeats>
                             <repeat value="5" repeats="1" field="selections" scope="3720-9b50-f599-76ea" childId="model" shared="true" roundUp="false" id="c23a-f133-3b3a-783" includeChildSelections="true"/>
                           </repeats>
diff --git a/2022 - Mech Library.cat b/2022 - Mech Library.cat
index 9d556887..4d4ab8e0 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="47" 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="48" 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"/>
diff --git a/2022 - Mechanicum.cat b/2022 - Mechanicum.cat
index 8559804f..87c80747 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="43" 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="44" 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>
@@ -3580,7 +3580,7 @@ This unit may be upgraded freely as described in their profile, though they may
                 </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"/>
+                    <condition type="atLeast" value="1" field="selections" scope="0e08-6b7e-8fff-1f02" childId="cc2a-46fe-bbf3-6ba2" shared="true" includeChildSelections="true"/>
                   </conditions>
                 </modifier>
               </modifiers>
diff --git a/Daemon Library.cat b/Daemon Library.cat
index 045eb66b..24390abe 100644
--- a/Daemon Library.cat	
+++ b/Daemon Library.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="true" id="31bf-eb23-33a-3d65" name="Daemon Library" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="4" battleScribeVersion="2.03" type="catalogue" authorName="a">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="true" id="31bf-eb23-33a-3d65" name="Daemon Library" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="77" revision="5" battleScribeVersion="2.03" type="catalogue" authorName="a">
   <sharedSelectionEntryGroups>
     <selectionEntryGroup id="002f-0e40-9d49-2a22" name="The Ætheric Dominion (X)" hidden="false" collective="false" import="true">
       <constraints>
@@ -32,14 +32,9 @@ A unit which includes models with this special rule without a specific Ætheric
           </costs>
           <modifiers>
             <modifier type="set" value="1" field="5b94-5ed5-4856-5d3d">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="c42-1919-c37e-51f0" shared="true" includeChildSelections="true"/>
-                    <condition type="atLeast" value="1" field="selections" scope="force" childId="ca6c-e8cf-7bc1-eaa0" shared="true" includeChildSelections="true"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="force" childId="ca6c-e8cf-7bc1-eaa0" shared="true" includeChildSelections="true"/>
+              </conditions>
             </modifier>
             <modifier type="set" value="0" field="1b96-95de-21aa-94f4">
               <conditionGroups>
@@ -77,14 +72,9 @@ Additionally, a unit entirely composed of models with this special rule adds +1
           </costs>
           <modifiers>
             <modifier type="set" value="1" field="5d04-bd7d-dced-173a">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="f074-f60a-9aa6-c52a" shared="true" includeChildSelections="true"/>
-                    <condition type="atLeast" value="1" field="selections" scope="force" childId="3d70-1d54-a791-ac60" shared="true" includeChildSelections="true"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="force" childId="3d70-1d54-a791-ac60" shared="true" includeChildSelections="true"/>
+              </conditions>
             </modifier>
             <modifier type="set" value="0" field="15a6-3993-5dd2-b14">
               <conditionGroups>
@@ -188,14 +178,9 @@ D3 - Result
           </costs>
           <modifiers>
             <modifier type="set" value="1" field="16d2-6ab1-cba5-8828">
-              <conditionGroups>
-                <conditionGroup type="and">
-                  <conditions>
-                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="8cf6-d802-d054-6a86" shared="true" includeChildSelections="true"/>
-                    <condition type="atLeast" value="1" field="selections" scope="force" childId="b7db-bf16-47c5-dc05" shared="true" includeChildSelections="true"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="force" childId="b7db-bf16-47c5-dc05" shared="true" includeChildSelections="true"/>
+              </conditions>
             </modifier>
             <modifier type="set" value="0" field="df60-2ef1-7656-9bd4">
               <conditionGroups>
@@ -306,14 +291,9 @@ Additionally, units entirely composed of models with this special rule must re-r
           </costs>
           <modifiers>
             <modifier type="set" value="1" field="813c-889b-e59a-8005">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="bcf6-8350-9099-1e91" shared="true" includeChildSelections="true"/>
-                    <condition type="atLeast" value="1" field="selections" scope="force" childId="9508-8124-d34a-500a" shared="true" includeChildSelections="true"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
+              <conditions>
+                <condition type="atLeast" value="1" field="selections" scope="force" childId="9508-8124-d34a-500a" shared="true" includeChildSelections="true"/>
+              </conditions>
             </modifier>
             <modifier type="set" value="0" field="cc04-6295-5d05-77ec">
               <conditionGroups>