diff --git a/Chaos - Chaos Space Marines.cat b/Chaos - Chaos Space Marines.cat
index 5f6aa5cf3e..0752f1ccc5 100644
--- a/Chaos - Chaos Space Marines.cat	
+++ b/Chaos - Chaos Space Marines.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="cb54-c035-5759-7697" name="Chaos - Chaos Space Marines" revision="199" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="224" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="cb54-c035-5759-7697" name="Chaos - Chaos Space Marines" revision="200" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="224" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="cb54-c035-pubN125652" name="Codex: Heretic Astartes - Chaos Space Marines"/>
     <publication id="cb54-c035-pubN153092" name="Imperium Nihilus: Vigilus Ablaze"/>
@@ -3074,6 +3074,9 @@ All units in your army with the HERETIC ASTARTES Faction keyword (excluding CHAO
           </conditionGroups>
         </modifier>
       </modifiers>
+      <constraints>
+        <constraint field="selections" scope="ff36a6f3-19bf-4f48-8956-adacfd28fe74" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="51f5-35f0-5da1-110e" type="max"/>
+      </constraints>
       <categoryLinks>
         <categoryLink id="27ca-c114-50a2-cd32" name="New CategoryLink" hidden="false" targetId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" primary="true"/>
       </categoryLinks>
@@ -3083,27 +3086,24 @@ All units in your army with the HERETIC ASTARTES Faction keyword (excluding CHAO
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
             <conditionGroup type="or">
-              <conditionGroups>
-                <conditionGroup type="and">
-                  <conditions>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="a0c7-2a71-bae0-215d" type="notInstanceOf"/>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="564e-55d5-79bc-a4d7" type="notInstanceOf"/>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="cccd-3d99-d4af-d668" type="notInstanceOf"/>
-                  </conditions>
-                </conditionGroup>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="dfc5-aa04-9546-1b4c" type="greaterThan"/>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="012f-abfc-397b-3519" type="greaterThan"/>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="1da2-76db-f76f-6b6c" type="greaterThan"/>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="539a-eb96-edf8-7f84" type="greaterThan"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
+              <conditions>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="dfc5-aa04-9546-1b4c" type="greaterThan"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="012f-abfc-397b-3519" type="greaterThan"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="1da2-76db-f76f-6b6c" type="greaterThan"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="539a-eb96-edf8-7f84" type="greaterThan"/>
+              </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="increment" field="ab6a-a91d-bc87-0871" value="1.0">
+          <repeats>
+            <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bfb5-a27f-ff1c-49e3" repeats="1" roundUp="false"/>
+          </repeats>
+        </modifier>
       </modifiers>
+      <constraints>
+        <constraint field="selections" scope="ff36a6f3-19bf-4f48-8956-adacfd28fe74" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="ab6a-a91d-bc87-0871" type="max"/>
+      </constraints>
       <categoryLinks>
         <categoryLink id="b2d0-62e0-76fb-4f99" name="New CategoryLink" hidden="false" targetId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" primary="true"/>
       </categoryLinks>
diff --git a/Chaos - Death Guard.cat b/Chaos - Death Guard.cat
index 3b6029ca3f..5e376ad5c2 100644
--- a/Chaos - Death Guard.cat	
+++ b/Chaos - Death Guard.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ce57-cc1c-37cb-cb71" name="Chaos - Death Guard" revision="146" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="223" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="ce57-cc1c-37cb-cb71" name="Chaos - Death Guard" revision="147" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@Mad_Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="224" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="ce57-cc1c-pubN85391" name="Index: Chaos FAQ"/>
     <publication id="ce57-cc1c-pubN108736" name="Codex: Heretic Astartes - Death Guard" publicationDate="23/01/2021"/>
@@ -2389,18 +2389,15 @@
     </entryLink>
     <entryLink id="8b04-d0f6-32a2-73ab" name="Mutoid Vermin" hidden="false" collective="false" import="true" targetId="85d0-fdc5-316b-69c1" type="selectionEntry">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="and">
-              <conditions>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="a0c7-2a71-bae0-215d" type="notInstanceOf"/>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="564e-55d5-79bc-a4d7" type="notInstanceOf"/>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="cccd-3d99-d4af-d668" type="notInstanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
+        <modifier type="increment" field="875c-c7b6-714c-ebef" value="1.0">
+          <repeats>
+            <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bfb5-a27f-ff1c-49e3" repeats="1" roundUp="false"/>
+          </repeats>
         </modifier>
       </modifiers>
+      <constraints>
+        <constraint field="selections" scope="ff36a6f3-19bf-4f48-8956-adacfd28fe74" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="875c-c7b6-714c-ebef" type="max"/>
+      </constraints>
       <categoryLinks>
         <categoryLink id="0ebc-6269-e6ea-bb2b" name="New CategoryLink" hidden="false" targetId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" primary="true"/>
       </categoryLinks>
@@ -2437,6 +2434,9 @@
           </conditionGroups>
         </modifier>
       </modifiers>
+      <constraints>
+        <constraint field="selections" scope="ff36a6f3-19bf-4f48-8956-adacfd28fe74" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="ca79-d2ef-6ac1-9a36" type="max"/>
+      </constraints>
       <categoryLinks>
         <categoryLink id="092d-1058-5387-ad24" name="New CategoryLink" hidden="false" targetId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" primary="true"/>
       </categoryLinks>
diff --git a/Chaos - Gellerpox Infected.cat b/Chaos - Gellerpox Infected.cat
index 32a476096f..4f351fc59e 100644
--- a/Chaos - Gellerpox Infected.cat	
+++ b/Chaos - Gellerpox Infected.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7fe3-1c65-72de-bc5d" name="Chaos - Gellerpox Infected" revision="11" battleScribeVersion="2.03" authorName="BSData Developers" authorUrl="https://www.bsdata.net/contact" library="true" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="223" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="7fe3-1c65-72de-bc5d" name="Chaos - Gellerpox Infected" revision="12" battleScribeVersion="2.03" authorName="BSData Developers" authorUrl="https://www.bsdata.net/contact" library="true" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="224" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="7fe3-1c65-pubN66333" name="Codex: Gellerpox Infected"/>
   </publications>
@@ -33,8 +33,15 @@
       </costs>
     </selectionEntry>
     <selectionEntry id="bfb5-a27f-ff1c-49e3" name="Gellerpox Infected" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="18b2-5c95-9ecb-b046" value="1.0">
+          <conditions>
+            <condition field="selections" scope="ancestor" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" type="instanceOf"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
-        <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="18b2-5c95-9ecb-b046" type="max"/>
+        <constraint field="selections" scope="force" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="18b2-5c95-9ecb-b046" type="max"/>
       </constraints>
       <profiles>
         <profile id="34d0-8c15-c5ce-8dac" name="Sickly Resilience" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
@@ -185,16 +192,6 @@
       </costs>
     </selectionEntry>
     <selectionEntry id="85d0-fdc5-316b-69c1" name="Mutoid Vermin" hidden="false" collective="false" import="true" type="unit">
-      <modifiers>
-        <modifier type="set" field="f6a9-8e00-d824-00aa" value="0.0">
-          <conditions>
-            <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bfb5-a27f-ff1c-49e3" type="equalTo"/>
-          </conditions>
-        </modifier>
-      </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="f6a9-8e00-d824-00aa" type="max"/>
-      </constraints>
       <profiles>
         <profile id="4b15-d667-982e-1611" name="Spreading Vermin" hidden="false" typeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" typeName="Abilities">
           <characteristics>