diff --git a/2021 - Blooded.cat b/2021 - Blooded.cat
index 91ce818..bd62203 100644
--- a/2021 - Blooded.cat	
+++ b/2021 - Blooded.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="bfeb-dc54-faa7-a9ba" name="Blooded" revision="2" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="bfeb-dc54-faa7-a9ba" name="Blooded" revision="3" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="a07d-2f4e-2358-5660" name="Traitor Chieftain" hidden="false"/>
     <categoryEntry id="dd95-f453-40a2-118d" name="Traitor Brimstone Grenadier" hidden="false"/>
@@ -1470,6 +1470,7 @@ This operative cannot perform this action while within Engagement Range of an en
     <selectionEntry id="afe5-8d04-a923-b22e" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4864-b1a3-c1a1-7ef0" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="ad2f-0893-c7ac-1d0e" type="max"/>
       </constraints>
       <profiles>
         <profile id="0976-c157-9c0f-1203" name="⌖ Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1495,6 +1496,7 @@ This operative cannot perform this action while within Engagement Range of an en
     <selectionEntry id="a494-1f2c-b00a-3b59" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4bc3-92b1-3f21-f130" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="f5ce-88f4-67c9-2ea0" type="max"/>
       </constraints>
       <profiles>
         <profile id="3592-4d17-072c-e1aa" name="⌖ Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -2024,6 +2026,13 @@ Incendiary Shells: Each time this weapon is selected to shoot with, you can choo
               </characteristics>
             </profile>
           </profiles>
+          <infoLinks>
+            <infoLink id="b4e6-86e5-0070-52d0" name="Rng x" hidden="false" targetId="92de-2ad3-3554-0b3e" type="rule"/>
+            <infoLink id="c069-a73d-7574-3ffb" name="Blast x" hidden="false" targetId="d848-be09-6d6d-4708" type="rule"/>
+            <infoLink id="2502-ac42-c893-e521" name="Indirect" hidden="false" targetId="653d-16a5-eefb-8b71" type="rule"/>
+            <infoLink id="65a3-297e-52e5-6673" name="No Cover" hidden="false" targetId="c091-97f7-8640-5e56" type="rule"/>
+            <infoLink id="102b-fdef-d738-f94b" name="Limited" hidden="false" targetId="1eb0-6ad3-3e5a-d8ec" type="rule"/>
+          </infoLinks>
           <costs>
             <cost name=" EP" typeId="c61a-51a3-370d-bf55" value="3.0"/>
           </costs>
@@ -2194,6 +2203,8 @@ Incendiary Shells: Each time this weapon is selected to shoot with, you can choo
             <cost name=" EP" typeId="c61a-51a3-370d-bf55" value="3.0"/>
           </costs>
         </entryLink>
+        <entryLink id="d22e-4f42-df63-96e9" name="Melee Weapons Rare Equipment" hidden="false" collective="false" import="true" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
+        <entryLink id="b88e-3830-c10f-2ca4" name="Ranged Weapons Rare Equipment" hidden="false" collective="false" import="true" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
       </entryLinks>
     </selectionEntryGroup>
     <selectionEntryGroup id="eeb2-4002-2c34-3243" name="Specialism" hidden="false" collective="false" import="true">
diff --git a/2021 - Brood Coven.cat b/2021 - Brood Coven.cat
index fcac797..746553b 100644
--- a/2021 - Brood Coven.cat	
+++ b/2021 - Brood Coven.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="8688-f7bc-228f-3b98" name="Brood Coven" revision="5" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="2" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="8688-f7bc-228f-3b98" name="Brood Coven" revision="6" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="b163-e801-3fdf-09e3" name="BROOD COVEN" hidden="false"/>
     <categoryEntry id="7e2a-1473-532f-9b94" name="Genestealer Cults" hidden="false"/>
@@ -1544,6 +1544,7 @@
         <selectionEntry id="f73d-e485-1263-f18f" name="Blasting Charge" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="12cd-edcf-bea2-5ded" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="3f1c-70fe-c776-d8c5" type="max"/>
           </constraints>
           <profiles>
             <profile id="3c93-bda7-3bdc-4bb3" name="Blasting Charge" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1569,6 +1570,7 @@
         <selectionEntry id="739d-3963-c0d2-2f78" name="Demolition Charge" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a2d5-2d94-825a-cc80" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="844a-da39-00b9-b1c8" type="max"/>
           </constraints>
           <profiles>
             <profile id="83b6-8f38-2aa0-c855" name="Demolition Charge" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Commorrite.cat b/2021 - Commorrite.cat
index b846b85..00d42ad 100644
--- a/2021 - Commorrite.cat	
+++ b/2021 - Commorrite.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="5a19-a6e8-8c74-0287" name="Commorrite" revision="5" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="2" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="5a19-a6e8-8c74-0287" name="Commorrite" revision="6" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="db5b-bf75-5058-17ab" name="Drukhari" hidden="false"/>
     <categoryEntry id="bfad-2e48-1ed7-e687" name="COMMORRITE" hidden="false"/>
@@ -856,6 +856,7 @@
         <selectionEntry id="7271-243d-49f0-ca53" name="Plasma Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cafe-835c-4dc0-b2ce" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="b06a-3539-0181-ff54" type="max"/>
           </constraints>
           <profiles>
             <profile id="20e3-4524-9d74-f29a" name="Plasma grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -888,6 +889,7 @@
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9155-ce75-16ec-aeb2" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="a767-1076-34ab-c932" type="max"/>
           </constraints>
           <profiles>
             <profile id="3786-9c11-b251-0007" name="Haywire Grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Corsair Voidscarred.cat b/2021 - Corsair Voidscarred.cat
index 0bec10e..13a09d8 100644
--- a/2021 - Corsair Voidscarred.cat	
+++ b/2021 - Corsair Voidscarred.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ad47-af38-c541-ae07" name="Corsair Voidscarred" revision="3" battleScribeVersion="2.03" authorName="Mad-Spy" authorContact="www.bsdata.net/contact" authorUrl="www.bsdata.net" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="ad47-af38-c541-ae07" name="Corsair Voidscarred" revision="4" battleScribeVersion="2.03" authorName="Mad-Spy" authorContact="www.bsdata.net/contact" authorUrl="www.bsdata.net" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="a2ec-0e4b-dd02-659d" name="CORSAIR VOIDSCARRED" hidden="false"/>
     <categoryEntry id="b378-bb76-8683-dba4" name="Voidscarred Felarch" hidden="false"/>
@@ -1554,6 +1554,7 @@ On a 6+, until the end of the Turning Point, friendly CORSAIR VOIDSCARRED operat
         <selectionEntry id="d348-fd1c-5d12-d263" name="Plasma Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9df4-af73-3e19-eb5d" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="c875-fb17-9364-4617" type="max"/>
           </constraints>
           <profiles>
             <profile id="946a-b6d1-3212-f228" name="Plasma Grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Craftworld.cat b/2021 - Craftworld.cat
index 667cc7e..572adaf 100644
--- a/2021 - Craftworld.cat	
+++ b/2021 - Craftworld.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ce44-2fc8-918c-7648" name="Craftworld" revision="7" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="ce44-2fc8-918c-7648" name="Craftworld" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="2caa-ece1-c503-4be3" name="CRAFTWORLD" hidden="false"/>
     <categoryEntry id="f0b3-2aae-2bd9-f763" name="Asuryani" hidden="false"/>
@@ -1292,6 +1292,7 @@
         <selectionEntry id="cada-c372-c693-3ad0" name="Plasma Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="211c-2114-5e8c-2713" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="9d4c-cb66-2387-d788" type="max"/>
           </constraints>
           <profiles>
             <profile id="b53e-0670-b3d6-00e2" name="⌖ Plasma grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Death Guard.cat b/2021 - Death Guard.cat
index 594c930..c558211 100644
--- a/2021 - Death Guard.cat	
+++ b/2021 - Death Guard.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7465-527f-4350-203d" name="Death Guard" revision="7" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="7465-527f-4350-203d" name="Death Guard" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="8dc1-46e8-f00d-0e7d" name="DEATH GUARD" hidden="false"/>
     <categoryEntry id="2075-e773-0480-a423" name="Poxwalker" hidden="false"/>
@@ -940,6 +940,7 @@
         <selectionEntry id="3501-681f-d3a9-25ae" name="Blight Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9689-5a34-d6df-4051" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="0161-5691-10b5-3a15" type="max"/>
           </constraints>
           <profiles>
             <profile id="8d88-ab57-7e50-a039" name="⌖ Blight grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -966,6 +967,7 @@
         <selectionEntry id="c055-a88c-f60c-1bc7" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="61fc-bedf-ed9c-2a64" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="544c-7ffc-69e0-37a5" type="max"/>
           </constraints>
           <profiles>
             <profile id="5d49-e7d3-2295-a6b8" name="⌖ Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Ecclesiarchy.cat b/2021 - Ecclesiarchy.cat
index 75f92cc..54f0d18 100644
--- a/2021 - Ecclesiarchy.cat	
+++ b/2021 - Ecclesiarchy.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="f0f5-a53d-98ae-4237" name="Ecclesiarchy" revision="7" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="2" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="f0f5-a53d-98ae-4237" name="Ecclesiarchy" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="a946-5ea7-18c7-5580" name="Adeptus Ministorum" hidden="false"/>
     <categoryEntry id="919a-20a2-f1cb-5848" name="Adepta Sororitas" hidden="false"/>
@@ -651,6 +651,9 @@
                   </characteristics>
                 </profile>
               </profiles>
+              <costs>
+                <cost name=" EP" typeId="c61a-51a3-370d-bf55" value="0.0"/>
+              </costs>
             </selectionEntry>
           </selectionEntries>
           <entryLinks>
@@ -1132,6 +1135,7 @@
         <selectionEntry id="d1ef-f059-7d72-9f01" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d3aa-d34c-f601-9a71" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="5d33-1e6d-973d-81e0" type="max"/>
           </constraints>
           <profiles>
             <profile id="9132-3396-5ede-ecc9" name="Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1157,6 +1161,7 @@
         <selectionEntry id="ce3d-f536-3319-000d" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fa29-990c-e9ee-a380" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="79e6-1465-186d-8b5e" type="max"/>
           </constraints>
           <profiles>
             <profile id="bbcf-8d6a-48d1-4a20" name="Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Greenskin.cat b/2021 - Greenskin.cat
index 7fe906c..6e4762f 100644
--- a/2021 - Greenskin.cat	
+++ b/2021 - Greenskin.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="07b1-fbc0-d4da-9e11" name="Greenskin" revision="7" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="07b1-fbc0-d4da-9e11" name="Greenskin" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="f1d6-69ab-df7c-6595" name="GREENSKIN" hidden="false"/>
     <categoryEntry id="0759-cc30-4a68-3fe1" name="Ork" hidden="false"/>
@@ -1128,6 +1128,7 @@
         <selectionEntry id="b4c5-ba4a-34bb-bbab" name="Stikkbomb" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4a18-d336-e2f1-5976" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="e823-291f-67d0-3ac1" type="max"/>
           </constraints>
           <profiles>
             <profile id="2c89-2ee7-d869-3e14" name="Stikkbomb" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Grey Knight.cat b/2021 - Grey Knight.cat
index de0454a..0a066ca 100644
--- a/2021 - Grey Knight.cat	
+++ b/2021 - Grey Knight.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="e96e-1002-726d-20d0" name="Grey Knight" revision="7" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="e96e-1002-726d-20d0" name="Grey Knight" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="1ab2-04de-05d9-dae0" name="Sanctic Astartes" hidden="false"/>
     <categoryEntry id="5952-b390-e458-dea9" name="Justicar" hidden="false"/>
@@ -391,6 +391,7 @@
         <selectionEntry id="fc6d-3e80-b7e0-44e3" name="Psyk-out Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3cc1-8572-8f5e-a5b5" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="c8f4-55de-b950-c49f" type="max"/>
           </constraints>
           <profiles>
             <profile id="9aa8-dca1-d9db-a03e" name="⌖ Psyk-out Grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Hunter Cadre.cat b/2021 - Hunter Cadre.cat
index bcc6527..8bfaf5f 100644
--- a/2021 - Hunter Cadre.cat	
+++ b/2021 - Hunter Cadre.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="2456-e367-fe75-6198" name="Hunter Cadre" revision="10" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="2456-e367-fe75-6198" name="Hunter Cadre" revision="11" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="f2b2-4d12-8018-11e3" name="T&apos;au" hidden="false"/>
     <categoryEntry id="8f20-916b-8d66-2b5a" name="HUNTER CADRE" hidden="false"/>
@@ -1546,6 +1546,7 @@
         <selectionEntry id="3476-c7e8-1857-f7b7" name="Photon Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="de10-c6cd-a996-13b3" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="3ea0-f00e-e1a8-8367" type="max"/>
           </constraints>
           <profiles>
             <profile id="a2ca-32db-487e-5773" name="Photon Grenade (1AP)" hidden="false" typeId="17cd-eb4c-f9cd-36f2" typeName="Unique Actions">
diff --git a/2021 - Hunter Clade.cat b/2021 - Hunter Clade.cat
index baf3d24..f925400 100644
--- a/2021 - Hunter Clade.cat	
+++ b/2021 - Hunter Clade.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="945a-0f25-eba7-691d" name="Hunter Clade" revision="7" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="945a-0f25-eba7-691d" name="Hunter Clade" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="c7e7-80f7-a912-1eec" name="Doctrina Imperatives">
       <characteristicTypes>
@@ -39,19 +39,12 @@
         </categoryLink>
         <categoryLink id="4d05-68ab-9a1a-8e8f" name="Operative" hidden="false" targetId="f98b-0289-0f1f-b233" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="9.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a6eb-d72c-9d94-7c2b" type="max"/>
+            <constraint field="selections" scope="force" value="10.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a6eb-d72c-9d94-7c2b" type="max"/>
           </constraints>
         </categoryLink>
         <categoryLink id="1e3a-60b9-41cd-7eb2" name="Gunner" hidden="false" targetId="ee8c-cc44-acc3-40f0" primary="false">
-          <modifiers>
-            <modifier type="increment" field="d04d-0214-be70-e7b6" value="1.0">
-              <conditions>
-                <condition field="selections" scope="force" value="4.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bf2c-0f37-ac1a-a88f" type="lessThan"/>
-              </conditions>
-            </modifier>
-          </modifiers>
           <constraints>
-            <constraint field="selections" scope="force" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d04d-0214-be70-e7b6" type="max"/>
+            <constraint field="selections" scope="force" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d04d-0214-be70-e7b6" type="max"/>
           </constraints>
         </categoryLink>
         <categoryLink id="cbc9-a5c4-1ee3-5011" name="Surveyor" hidden="false" targetId="bfc8-f580-1682-87cd" primary="false">
diff --git a/2021 - Imperial Guard.cat b/2021 - Imperial Guard.cat
index d2ea0e0..7462780 100644
--- a/2021 - Imperial Guard.cat	
+++ b/2021 - Imperial Guard.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="35ce-2f8e-99d7-d28a" name="Imperial Guard" revision="9" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="35ce-2f8e-99d7-d28a" name="Imperial Guard" revision="10" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="bf04-d101-3b35-69a6" name="IMPERIAL GUARD" hidden="false"/>
     <categoryEntry id="3fb5-3177-c55b-9a11" name="Tempestus Scion" hidden="false"/>
@@ -1511,6 +1511,7 @@
         <selectionEntry id="6961-c0a3-af44-8821" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f57c-4510-bc62-1ad9" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="0b07-dd8b-235a-bcd3" type="max"/>
           </constraints>
           <profiles>
             <profile id="f35f-83f8-aa8c-f3ee" name="⌖ Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1536,6 +1537,7 @@
         <selectionEntry id="0c85-fe72-aa31-759d" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8cdb-b618-3b85-ee55" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="6c5f-fed2-d292-a21d" type="max"/>
           </constraints>
           <profiles>
             <profile id="bfa3-09fa-4c9a-3387" name="⌖ Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Kommando.cat b/2021 - Kommando.cat
index cbb4628..dbb7398 100644
--- a/2021 - Kommando.cat	
+++ b/2021 - Kommando.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="9210-4d15-82ce-4526" name="Kommando" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="9210-4d15-82ce-4526" name="Kommando" revision="9" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="fff5-e805-1699-7f74" name="Ork" hidden="false"/>
     <categoryEntry id="27c3-6016-6b60-a2d3" name="Kommando Grot" hidden="false"/>
@@ -1360,6 +1360,7 @@
         <selectionEntry id="0139-613e-fe57-b163" name="Stikkbomb" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cf2c-6cec-bcc8-9543" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="841c-717d-d8b0-dae6" type="max"/>
           </constraints>
           <profiles>
             <profile id="446e-a24e-0e7e-304a" name="Stikkbomb" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Legionary.cat b/2021 - Legionary.cat
index df89412..79b08f1 100644
--- a/2021 - Legionary.cat	
+++ b/2021 - Legionary.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="684b-8f50-cf10-b4d1" name="Legionary" revision="3" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="684b-8f50-cf10-b4d1" name="Legionary" revision="4" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="09a8-4f6a-15c1-6bcc" name="Khorne" hidden="false"/>
     <categoryEntry id="b3e4-8842-b1f5-fc43" name="Nurgle" hidden="false"/>
@@ -1759,6 +1759,7 @@
         <selectionEntry id="f1da-3cd0-264b-09c3" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dfd9-7f32-cf2b-bc3b" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="7cfe-8308-81ad-a890" type="max"/>
           </constraints>
           <profiles>
             <profile id="10b8-beaa-8b0f-50b8" name="⌖ Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1784,6 +1785,7 @@
         <selectionEntry id="4ede-4073-dd38-9e87" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ab9b-db5e-f308-bb24" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="cc6c-6c0a-76e2-a7cf" type="max"/>
           </constraints>
           <profiles>
             <profile id="ea2a-d863-d41e-0a5d" name="⌖ Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Novitiate.cat b/2021 - Novitiate.cat
index df9be6a..27a080e 100644
--- a/2021 - Novitiate.cat	
+++ b/2021 - Novitiate.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="f8ef-a36f-f720-5f60" name="Novitiate" revision="5" battleScribeVersion="2.03" authorName="Mad-Spy" authorContact="" authorUrl="https://bsdata.net" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="f8ef-a36f-f720-5f60" name="Novitiate" revision="6" battleScribeVersion="2.03" authorName="Mad-Spy" authorContact="" authorUrl="https://bsdata.net" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="0bd2-8527-d8d9-fc3b" name="Acts of Faith">
       <characteristicTypes>
@@ -1895,6 +1895,7 @@ Unless otherwise specified, only one Act of Faith can be used during each activa
         <selectionEntry id="132d-43fe-3e89-42f1" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9c0b-ddca-b799-4764" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="a863-e9da-e10f-b9c9" type="max"/>
           </constraints>
           <profiles>
             <profile id="2cff-b403-d03c-4d47" name="Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1920,6 +1921,7 @@ Unless otherwise specified, only one Act of Faith can be used during each activa
         <selectionEntry id="13c5-e290-80c9-09a1" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="91b2-5666-c07d-1636" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="15aa-855a-5d78-9541" type="max"/>
           </constraints>
           <profiles>
             <profile id="6d6b-6dfb-4c75-5a98" name="Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Pathfinder.cat b/2021 - Pathfinder.cat
index cbab15e..c6d8c12 100644
--- a/2021 - Pathfinder.cat	
+++ b/2021 - Pathfinder.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="50fd-3b1c-0a95-233b" name="Pathfinder" revision="5" battleScribeVersion="2.03" authorName="Mad-Spy" authorUrl="https://bsdata.net" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="50fd-3b1c-0a95-233b" name="Pathfinder" revision="6" battleScribeVersion="2.03" authorName="Mad-Spy" authorUrl="https://bsdata.net" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="3394-cf2d-5727-164a" name="Markerlight Tokens">
       <characteristicTypes>
@@ -952,6 +952,7 @@ This operative cannot perform this action if it is within Engagement Range of an
     <selectionEntry id="6552-81bf-a748-4431" name="Fusion Grenade" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d1e9-025e-c575-a435" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="6479-6ed8-d25b-1486" type="max"/>
       </constraints>
       <profiles>
         <profile id="d6f0-8292-b7b9-457d" name="Fusion grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -997,6 +998,7 @@ On a 2+, that enemy operative gains a Photon token. While an operative has any P
     <selectionEntry id="7548-4ef8-745a-7772" name="EMP Grenade" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="47ea-4d8e-46ec-83d4" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="4ec4-5dc6-9529-40d0" type="max"/>
       </constraints>
       <profiles>
         <profile id="0f9b-351b-cf4d-83c5" name="EMP grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Phobos Strike Team.cat b/2021 - Phobos Strike Team.cat
index a71e1df..2451b69 100644
--- a/2021 - Phobos Strike Team.cat	
+++ b/2021 - Phobos Strike Team.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="555c-9d39-ccdc-f007" name="Phobos Strike Team" revision="2" battleScribeVersion="2.03" authorName="@Mad-Spy" authorContact="" authorUrl="https://bsdata.net" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="555c-9d39-ccdc-f007" name="Phobos Strike Team" revision="3" battleScribeVersion="2.03" authorName="@Mad-Spy" authorContact="" authorUrl="https://bsdata.net" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="584e-6521-8a6f-b708" name="Adeptus Astartes" hidden="false"/>
     <categoryEntry id="429e-f448-e1c5-5044" name="Primaris" hidden="false"/>
@@ -585,7 +585,7 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="701f-2b78-4bc3-4def" name="New CategoryLink" hidden="false" targetId="f98b-0289-0f1f-b233" primary="true"/>
-		<categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
+        <categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
         <categoryLink id="ea53-cd20-8105-a64b" name="Imperium" hidden="false" targetId="15ae-553e-01d1-23a9" primary="false"/>
         <categoryLink id="3cde-931c-93ff-9cfa" name="Adeptus Astartes" hidden="false" targetId="584e-6521-8a6f-b708" primary="false"/>
         <categoryLink id="83f6-64b6-4552-1a94" name="Primaris" hidden="false" targetId="429e-f448-e1c5-5044" primary="false"/>
@@ -672,7 +672,7 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="4d78-8c5e-d46a-2b9f" name="New CategoryLink" hidden="false" targetId="f98b-0289-0f1f-b233" primary="true"/>
-		<categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
+        <categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
         <categoryLink id="a5af-6c2b-682e-0171" name="Imperium" hidden="false" targetId="15ae-553e-01d1-23a9" primary="false"/>
         <categoryLink id="6483-3a66-4513-303c" name="Adeptus Astartes" hidden="false" targetId="584e-6521-8a6f-b708" primary="false"/>
         <categoryLink id="e9b7-9e5d-f52d-b65d" name="Primaris" hidden="false" targetId="429e-f448-e1c5-5044" primary="false"/>
@@ -761,7 +761,7 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="654f-8923-fd0f-6f76" name="New CategoryLink" hidden="false" targetId="f98b-0289-0f1f-b233" primary="true"/>
-		<categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
+        <categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
         <categoryLink id="a72d-cd0b-c82f-c632" name="Imperium" hidden="false" targetId="15ae-553e-01d1-23a9" primary="false"/>
         <categoryLink id="cd8e-1e1a-965e-b4ef" name="Adeptus Astartes" hidden="false" targetId="584e-6521-8a6f-b708" primary="false"/>
         <categoryLink id="15da-9b9f-3200-eb42" name="Primaris" hidden="false" targetId="429e-f448-e1c5-5044" primary="false"/>
@@ -819,7 +819,7 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5f9c-7ab4-fa6e-cacb" name="Imperium" hidden="false" targetId="15ae-553e-01d1-23a9" primary="false"/>
-		<categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
+        <categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
         <categoryLink id="831a-b44c-860f-b6d4" name="Adeptus Astartes" hidden="false" targetId="584e-6521-8a6f-b708" primary="false"/>
         <categoryLink id="21df-d580-01d8-0ee8" name="Primaris" hidden="false" targetId="429e-f448-e1c5-5044" primary="false"/>
         <categoryLink id="277c-3096-8305-ca73" name="Incursor" hidden="false" targetId="3b99-b5cd-8fe5-5590" primary="false"/>
@@ -876,7 +876,7 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="d689-71f3-d147-8891" name="Operative" hidden="false" targetId="f98b-0289-0f1f-b233" primary="true"/>
-		<categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
+        <categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
         <categoryLink id="f304-a5b7-49cf-bade" name="Imperium" hidden="false" targetId="15ae-553e-01d1-23a9" primary="false"/>
         <categoryLink id="f619-61dc-b3cb-8cab" name="Adeptus Astartes" hidden="false" targetId="584e-6521-8a6f-b708" primary="false"/>
         <categoryLink id="1abe-82e6-4215-e0ad" name="Primaris" hidden="false" targetId="429e-f448-e1c5-5044" primary="false"/>
@@ -971,7 +971,7 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="acf5-c0a8-2ad4-770a" name="Imperium" hidden="false" targetId="15ae-553e-01d1-23a9" primary="false"/>
-		<categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
+        <categoryLink id="50a6-82e3-070e-562f" name="PHOBOS STRIKE TEAM" hidden="false" targetId="7b9a-40d0-e573-307b" primary="false"/>
         <categoryLink id="8fc8-ab1d-0a89-e60a" name="Adeptus Astartes" hidden="false" targetId="584e-6521-8a6f-b708" primary="false"/>
         <categoryLink id="c552-1d94-0c48-9276" name="Primaris" hidden="false" targetId="429e-f448-e1c5-5044" primary="false"/>
         <categoryLink id="4b63-4dcd-f303-103b" name="Reiver" hidden="false" targetId="1f0a-cd7f-5160-edaa" primary="false"/>
@@ -1459,6 +1459,7 @@
         <selectionEntry id="bfe1-aedb-0a92-c512" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5922-7cd4-17d7-08a8" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="bbe6-9599-5be2-82c4" type="max"/>
           </constraints>
           <profiles>
             <profile id="ab65-22d1-a708-e360" name="⌖ Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1484,6 +1485,7 @@
         <selectionEntry id="590b-1a44-efb8-54bd" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a516-5294-298a-a310" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="523d-814c-be96-ec57" type="max"/>
           </constraints>
           <profiles>
             <profile id="4748-b78a-f949-b6ee" name="⌖ Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1676,6 +1678,10 @@
           </costs>
         </selectionEntry>
       </selectionEntries>
+      <entryLinks>
+        <entryLink id="d521-31d3-cb8e-5fb8" name="Melee Weapons Rare Equipment" hidden="false" collective="false" import="true" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
+        <entryLink id="6865-67a7-a0fc-5a81" name="Ranged Weapons Rare Equipment" hidden="false" collective="false" import="true" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
+      </entryLinks>
     </selectionEntryGroup>
     <selectionEntryGroup id="89ac-9464-ad52-5187" name="Speciallism" hidden="false" collective="false" import="true">
       <modifiers>
diff --git a/2021 - Space Marine.cat b/2021 - Space Marine.cat
index dc3502e..5816c93 100644
--- a/2021 - Space Marine.cat	
+++ b/2021 - Space Marine.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="78ae-9b9e-d839-725c" name="Space Marine" revision="13" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="78ae-9b9e-d839-725c" name="Space Marine" revision="14" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="c6d4-8f35-b8e5-d319" name="Adeptus Astartes" hidden="false"/>
     <categoryEntry id="09fb-fa9f-6d29-e39d" name="Primaris" hidden="false"/>
@@ -4035,6 +4035,7 @@
         <selectionEntry id="b870-c72f-0319-af50" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a85f-246a-757c-eb06" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="385f-6ef4-9fdc-913a" type="max"/>
           </constraints>
           <profiles>
             <profile id="4232-394a-3421-2962" name="⌖ Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -4157,6 +4158,7 @@
         <selectionEntry id="f900-09de-2c4e-3ef9" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="db9c-e09e-b24e-528d" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="49a6-00d3-9299-ee69" type="max"/>
           </constraints>
           <profiles>
             <profile id="710a-dd93-141c-bf89" name="⌖ Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Talons of the Emperor.cat b/2021 - Talons of the Emperor.cat
index 17e4baf..4c17c5b 100644
--- a/2021 - Talons of the Emperor.cat	
+++ b/2021 - Talons of the Emperor.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="2438-9266-31a7-2bea" name="Talons of the Emperor" revision="5" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="2" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="2438-9266-31a7-2bea" name="Talons of the Emperor" revision="6" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="5f09-5731-6cb3-72e6" name="TALONS OF THE EMPEROR" hidden="false"/>
     <categoryEntry id="b97a-3b33-7b03-24c0" name="Adeptus Custodes" hidden="false"/>
@@ -705,6 +705,7 @@
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4c88-56b1-3159-f67b" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="5fc3-2ed7-7513-704e" type="max"/>
           </constraints>
           <profiles>
             <profile id="9ddb-07cd-664a-fe32" name="⌖ Psyk-out Grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Tomb World.cat b/2021 - Tomb World.cat
index 02a12a7..1c9192c 100644
--- a/2021 - Tomb World.cat	
+++ b/2021 - Tomb World.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="9190-8f26-233b-d869" name="Tomb World" revision="9" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="9190-8f26-233b-d869" name="Tomb World" revision="10" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="3050-3375-0060-24d0" name="Necron" hidden="false"/>
     <categoryEntry id="38e8-ff21-955c-361d" name="Necron Warrior" hidden="false"/>
@@ -704,6 +704,7 @@
         <selectionEntry id="8c45-6f11-184e-78cc" name="Devourer Nanoscarabs" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6698-02e0-da6b-7e09" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="91f8-e2d8-c9c6-b19e" type="max"/>
           </constraints>
           <profiles>
             <profile id="54a9-7eaf-865f-5a9a" name="⌖ Devourer Nanoscarabs" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Traitor Space Marine.cat b/2021 - Traitor Space Marine.cat
index 0a1bec0..3d85417 100644
--- a/2021 - Traitor Space Marine.cat	
+++ b/2021 - Traitor Space Marine.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="228f-66c4-e3e0-2b01" name="Traitor Space Marine" revision="9" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="228f-66c4-e3e0-2b01" name="Traitor Space Marine" revision="10" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="dc01-4030-c1e5-8e9a" name="Chaos Space Marine" hidden="false"/>
     <categoryEntry id="2e87-8f94-62f7-9457" name="TRAITOR SPACE MARINE" hidden="false"/>
@@ -1232,6 +1232,7 @@
         <selectionEntry id="6371-9d64-2b05-9112" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d9d3-a838-bb5b-f2ef" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="821a-0008-73a5-f696" type="max"/>
           </constraints>
           <profiles>
             <profile id="2483-8503-8778-c83e" name="Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1257,6 +1258,7 @@
         <selectionEntry id="8984-11ed-fb45-d608" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cef7-2d13-1fc1-f5b9" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="b712-f903-d21b-a75a" type="max"/>
           </constraints>
           <profiles>
             <profile id="42c7-a0e6-638b-642a" name="Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Troupe.cat b/2021 - Troupe.cat
index 7fa8c49..d8930d3 100644
--- a/2021 - Troupe.cat	
+++ b/2021 - Troupe.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7dce-23ed-9607-16ae" name="Troupe (Legends)" revision="7" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="7dce-23ed-9607-16ae" name="Troupe (Legends)" revision="8" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="0eb1-3543-bb77-7baa" name="Player" hidden="false"/>
     <categoryEntry id="6d00-9251-6013-c017" name="Harlequins" hidden="false"/>
@@ -573,6 +573,7 @@
         <selectionEntry id="533e-7a98-a86b-33e1" name="Prismatic Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a4b6-72e2-2217-067a" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="4659-3d17-627b-b1d1" type="max"/>
           </constraints>
           <profiles>
             <profile id="4145-2c70-2fd2-a5d5" name="Prismatic grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Veteran Guardsmen.cat b/2021 - Veteran Guardsmen.cat
index 593a439..d9f416b 100644
--- a/2021 - Veteran Guardsmen.cat	
+++ b/2021 - Veteran Guardsmen.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="8e62-da18-67f9-c594" name="Veteran Guardsmen" revision="11" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="8e62-da18-67f9-c594" name="Veteran Guardsmen" revision="12" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="6790-22ed-c8fa-6309" name="Comms Veteran" hidden="false"/>
     <categoryEntry id="e2e3-78d3-0b08-9d27" name="VETERAN GUARDSMAN" hidden="false"/>
@@ -1933,6 +1933,7 @@
         <selectionEntry id="b5c1-65e2-0d79-cfa6" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cdcd-f7ab-f33d-097f" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="7b1f-9d87-a9f8-925d" type="max"/>
           </constraints>
           <profiles>
             <profile id="3ad5-86b7-077f-35c8" name="Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1958,6 +1959,7 @@
         <selectionEntry id="729b-2d5f-3981-4969" name="Krak Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9aab-dc6b-7e81-cd26" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="0002-d122-e84d-0b20" type="max"/>
           </constraints>
           <profiles>
             <profile id="753f-981e-8ac5-5fe3" name="Krak grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Void-Dancer Troupe.cat b/2021 - Void-Dancer Troupe.cat
index 71bf240..583c845 100644
--- a/2021 - Void-Dancer Troupe.cat	
+++ b/2021 - Void-Dancer Troupe.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7232-14ad-4b1e-3aeb" name="Void-Dancer Troupe" revision="4" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="7232-14ad-4b1e-3aeb" name="Void-Dancer Troupe" revision="5" battleScribeVersion="2.03" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="e0f0-c569-de36-d361" name="Allegory">
       <characteristicTypes>
@@ -715,7 +715,6 @@ Note that this means, for the purposes of your kill team&apos;s Performance tall
 When you add the fourth mark to your Performance tally:
 - All friendly VOID-DANCER TROUPE operatives have the Accolade ability of the active Allegory until the end of the battle.
 - You gain 1 Command Point.
-- In the Generate Command Points step of each Turning Point, you generate one additional Command Point.
 </description>
         </rule>
       </rules>
@@ -1008,6 +1007,7 @@ When you add the fourth mark to your Performance tally:
         <selectionEntry id="e44b-dd26-9237-bc7f" name="Prismatic Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="eee4-c2ec-8961-2da5" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="4230-67be-1a4c-ef44" type="max"/>
           </constraints>
           <profiles>
             <profile id="5dbc-5662-1693-43b8" name="Prismatic grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
diff --git a/2021 - Wyrmblade.cat b/2021 - Wyrmblade.cat
index 2a18e79..ed5f7dd 100644
--- a/2021 - Wyrmblade.cat	
+++ b/2021 - Wyrmblade.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="381a-c69a-a399-fbbc" name="Wyrmblade" revision="3" battleScribeVersion="2.03" authorName="Mad-Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="381a-c69a-a399-fbbc" name="Wyrmblade" revision="4" battleScribeVersion="2.03" authorName="Mad-Spy" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="a223-4c7f-7c64-cdd1" name="Cult Agent" hidden="false"/>
     <categoryEntry id="06d8-a7f8-589c-a573" name="WYRMBLADE" hidden="false"/>
@@ -1485,6 +1485,7 @@
         <selectionEntry id="871c-145d-bf4f-efae" name="Frag Grenade" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c892-eaa1-4e1b-0096" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="7c2b-03a8-c063-03c9" type="max"/>
           </constraints>
           <profiles>
             <profile id="faa1-451e-f7ee-72eb" name="⌖ Frag grenade" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">
@@ -1510,6 +1511,7 @@
         <selectionEntry id="8fc1-277f-8753-f9b9" name="Blasting Charge" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7d52-5471-6059-9298" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="dce8-ffd3-007d-1e4d" type="max"/>
           </constraints>
           <profiles>
             <profile id="f6cd-0945-d1a3-2155" name="⌖ Blasting charge" hidden="false" typeId="a917-3c2e-f7b8-1bdc" typeName="Weapons">