diff --git a/2022 - Horus Heresy.gst b/2022 - Horus Heresy.gst
index 53fac8da..3c66f82c 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="123" battleScribeVersion="2.03" type="gameSystem">
+<gameSystem xmlns="http://www.battlescribe.net/schema/gameSystemSchema" id="28d4-bd2e-4858-ece6" name="Horus Heresy (2022)" revision="124" 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"/>
@@ -2264,7 +2264,7 @@ If that test is failed, the unit suffers one Wound, allocated by the controllin
         </categoryLink>
         <categoryLink id="5993-fb7c-61e3-5ebe" name="Troops:" hidden="false" targetId="9b5d-fac7-799b-d7e7" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="5" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="1123-aa10-36fb-11cb" type="max"/>
+            <constraint field="selections" scope="force" value="6" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="1123-aa10-36fb-11cb" type="max"/>
             <constraint field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="59b1-dec2-1330-6a5a" type="min"/>
           </constraints>
           <modifiers>
diff --git a/2022 - Imperialis Militia.cat b/2022 - Imperialis Militia.cat
index 8fe0f877..48cae23e 100644
--- a/2022 - Imperialis Militia.cat	
+++ b/2022 - Imperialis Militia.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="f84d-94cf-5ce6-b393" name="Imperialis Militia" revision="43" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="f84d-94cf-5ce6-b393" name="Imperialis Militia" revision="44" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" type="catalogue">
   <categoryEntries>
     <categoryEntry id="58b3-196a-9732-2165" name="Rogue Psyker Daemons Restriction" publicationId="48c2-d023-0069-001a" page="15" hidden="false">
       <modifiers>
@@ -2594,6 +2594,7 @@ Note that only Militia Medicae selected as part of a Detachment with the Ogryn C
                     </modifier>
                   </modifiers>
                 </entryLink>
+                <entryLink import="true" name="Shotgun" hidden="false" id="5e24-38b9-0ffb-f023" collective="false" targetId="f0aa-947f-f493-f566" type="selectionEntry"/>
               </entryLinks>
             </selectionEntryGroup>
             <selectionEntryGroup id="cf27-57a0-e409-0525" name="2) May Take" hidden="false" collective="false" import="true">
@@ -7568,9 +7569,6 @@ Note that only Militia Medicae selected as part of a Detachment with the Ogryn C
               </categoryLinks>
             </selectionEntry>
           </selectionEntries>
-          <entryLinks>
-            <entryLink id="d424-2660-1a6e-ae95" name="Provenance Options" hidden="false" collective="false" import="true" targetId="5fb4-282e-7957-1492" type="selectionEntryGroup"/>
-          </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <costs>
@@ -7579,6 +7577,9 @@ Note that only Militia Medicae selected as part of a Detachment with the Ogryn C
       <categoryLinks>
         <categoryLink name="SA or IM Unit" hidden="false" id="82a2-cd04-8cb1-47a6" targetId="4aca-2849-7f41-0200" primary="false"/>
       </categoryLinks>
+      <entryLinks>
+        <entryLink import="true" name="Provenance Options" hidden="false" id="d424-2660-1a6e-ae95" collective="false" targetId="5fb4-282e-7957-1492" type="selectionEntryGroup"/>
+      </entryLinks>
     </selectionEntry>
     <selectionEntry id="987d-3f99-2c52-3da4" name="IM - Sentinel Squadron" publicationId="48c2-d023-0069-001a" hidden="false" collective="false" import="true" type="unit">
       <categoryLinks>
@@ -8035,7 +8036,7 @@ Note that only Militia Medicae selected as part of a Detachment with the Ogryn C
                 <constraint field="selections" scope="parent" value="0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="725e-7672-9633-835e" type="max"/>
               </constraints>
               <modifiers>
-                <modifier type="set" field="725e-7672-9633-835e" value="3">
+                <modifier type="increment" field="725e-7672-9633-835e" value="3">
                   <repeats>
                     <repeat field="selections" scope="fbb6-c597-3edb-1506" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="0f40-258b-c404-87ab" repeats="1" roundUp="false"/>
                   </repeats>
diff --git a/2022 - LA - Alpha Legion.cat b/2022 - LA - Alpha Legion.cat
index bfe3e195..5ec8296b 100644
--- a/2022 - LA - Alpha Legion.cat	
+++ b/2022 - LA - Alpha Legion.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="9c06-1c61-d01d-8445" name="LA - XX: Alpha Legion" revision="57" battleScribeVersion="2.03" authorName="Alphalas" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="9c06-1c61-d01d-8445" name="LA - XX: Alpha Legion" revision="58" battleScribeVersion="2.03" authorName="Alphalas" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
   <categoryEntries>
     <categoryEntry id="2275-5253-2421-7383" name="Rewards of Trechery" hidden="false">
       <modifiers>
@@ -6469,7 +6469,7 @@
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="42af-ab98-e733-dc01" name="Armillus Dynat" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="42af-ab98-e733-dc01" name="Armillus Dynat" hidden="false" collective="false" import="true" type="unit">
       <constraints>
         <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5e38-f7b6-b684-7d33" type="max"/>
       </constraints>
diff --git a/2022 - LA - Blood Angels.cat b/2022 - LA - Blood Angels.cat
index 51c2fed2..bd8c2f18 100644
--- a/2022 - LA - Blood Angels.cat	
+++ b/2022 - LA - Blood Angels.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="cd4d-8765-5387-8409" name="LA -  IX: Blood Angels" revision="50" battleScribeVersion="2.03" authorName="Jon K &quot;Alphalas&quot;" authorContact="Twitter: Alphalas_ Discord: Alphalas#8789" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="cd4d-8765-5387-8409" name="LA -  IX: Blood Angels" revision="51" battleScribeVersion="2.03" authorName="Jon K &quot;Alphalas&quot;" authorContact="Twitter: Alphalas_ Discord: Alphalas#8789" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="1900-3f09-f47b-bed2" name="Praetor" hidden="false" collective="false" import="false" targetId="03be-5d55-d05a-771d" type="selectionEntry">
       <comment>template_id_5798-3fc7-4d4c-ad41</comment>
@@ -2818,7 +2818,6 @@
       <categoryLinks>
         <categoryLink id="2107-cb19-8471-dcc7" name="Unit:" hidden="false" targetId="36c3-e85e-97cc-c503" primary="false"/>
         <categoryLink id="7bb4-00df-bb76-55c2" name="Troops:" hidden="false" targetId="9b5d-fac7-799b-d7e7" primary="true"/>
-        <categoryLink id="4cf1-6f09-8cae-9d30" name="Compulsory Troops:" hidden="false" targetId="8f42-a824-fb5f-8fea" primary="false"/>
       </categoryLinks>
     </entryLink>
     <entryLink id="6a40-f9ed-c05d-5013" name="Termite Assault Drill" hidden="true" collective="false" import="false" targetId="cb30-307a-f0d7-3b13" type="selectionEntry">
diff --git a/2022 - LA - Dark Angels.cat b/2022 - LA - Dark Angels.cat
index 1c949380..c4b433cb 100644
--- a/2022 - LA - Dark Angels.cat	
+++ b/2022 - LA - Dark Angels.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ee5e-198e-1b19-4b9f" name="LA -   I: Dark Angels" revision="39" battleScribeVersion="2.03" authorName="revivedtitan" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="72" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ee5e-198e-1b19-4b9f" name="LA -   I: Dark Angels" revision="40" battleScribeVersion="2.03" authorName="revivedtitan" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="72" type="catalogue">
   <entryLinks>
     <entryLink id="7653-8041-8d1c-c872" name="Dreadwing Interemptor Squad" hidden="false" collective="false" import="false" targetId="3008-e8ed-9e97-71c9" type="selectionEntry">
       <categoryLinks>
@@ -3974,7 +3974,11 @@ Selenite Shard-bolt Pistol</description>
           <infoLinks>
             <infoLink id="0788-0df4-c608-ff0f" name="Marshal of the Crown" hidden="false" targetId="7b52-e033-811f-dd15" type="profile">
               <modifiers>
-                <modifier type="set" field="name" value="Marshal of the Crown (Dreadwing)"/>
+                <modifier type="set" field="name" value="Marshal of the Crown (Dreadwing)">
+                  <conditions>
+                    <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="any" shared="true" includeChildSelections="false"/>
+                  </conditions>
+                </modifier>
               </modifiers>
             </infoLink>
           </infoLinks>
diff --git a/2022 - LA - Imperial Fists.cat b/2022 - LA - Imperial Fists.cat
index 034ca2b4..1560047f 100644
--- a/2022 - LA - Imperial Fists.cat	
+++ b/2022 - LA - Imperial Fists.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="8866-00ec-715f-f21a" name="LA -   VII: Imperial Fists" revision="40" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="8866-00ec-715f-f21a" name="LA -   VII: Imperial Fists" revision="41" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="b3e4-1487-4ab7-7515" name="Alexis Polux" hidden="false" collective="false" import="false" targetId="9229-b4f9-2213-9672" type="selectionEntry">
       <modifiers>
@@ -5896,9 +5896,6 @@ Butcher of Larissan – If, at the start of any player turn, the opposing player
               </characteristics>
             </profile>
           </profiles>
-          <infoLinks>
-            <infoLink id="4a10-238a-660a-b604" name="Master Tactician" targetId="e9eb-a5a2-1f4a-d591" type="profile"/>
-          </infoLinks>
         </entryLink>
       </entryLinks>
       <costs>
diff --git a/2022 - LA - Sons of Horus.cat b/2022 - LA - Sons of Horus.cat
index 9b8df3ea..1c8c0da5 100644
--- a/2022 - LA - Sons of Horus.cat	
+++ b/2022 - LA - Sons of Horus.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="62c7-42f4-5523-af1b" name="LA -  XVI: Sons of Horus" revision="47" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="62c7-42f4-5523-af1b" name="LA -  XVI: Sons of Horus" revision="48" battleScribeVersion="2.03" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="c2a2-9b6d-b384-3f43" name="XVI: Sons of Horus" hidden="false" collective="false" import="false" targetId="01b4-57c7-bf61-2abf" type="selectionEntry">
       <modifiers>
@@ -77,7 +77,7 @@
         <categoryLink id="c2bd-dc92-2e11-b309" name="Compulsory HQ:" hidden="false" targetId="f823-8c1d-6a87-26a1" primary="false"/>
       </categoryLinks>
       <costs>
-        <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="175"/>
+        <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="160"/>
       </costs>
     </entryLink>
     <entryLink id="79f4-181d-3ce9-f37b" name="Reaver Aggressor Squad" hidden="true" collective="false" import="false" targetId="af3a-334f-152f-d55f" type="selectionEntry">
@@ -3127,7 +3127,7 @@
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink targetId="4f85-eb33-30c9-8f51" id="2483-bb89-a364-45eb" primary="false" name="HQ:"/>
+        <categoryLink targetId="4f85-eb33-30c9-8f51" id="2483-bb89-a364-45eb" primary="true" name="HQ:"/>
         <categoryLink targetId="36c3-e85e-97cc-c503" id="2ef7-0592-c90e-6466" primary="false" name="Unit:"/>
         <categoryLink targetId="8b4f-bfe2-ce7b-f1b1" id="d4da-ec97-70f8-04eb" primary="false" name="Infantry Unit Type"/>
       </categoryLinks>
@@ -5894,7 +5894,7 @@ In addition, an army whose Warlord has this trait may make an additional Reactio
                 </selectionEntryGroup>
                 <selectionEntryGroup id="e4a7-cb9d-8d08-32bc" name="Special Weapons:" hidden="false" collective="false" import="true">
                   <modifiers>
-                    <modifier type="set" field="eb21-e253-cfc7-f8b4" value="1">
+                    <modifier type="increment" field="eb21-e253-cfc7-f8b4" value="1">
                       <repeats>
                         <repeat field="selections" scope="af3a-334f-152f-d55f" value="5" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" repeats="1" roundUp="false"/>
                       </repeats>
diff --git a/2022 - LA - Space Wolves.cat b/2022 - LA - Space Wolves.cat
index 3cb586cb..62be8a89 100644
--- a/2022 - LA - Space Wolves.cat	
+++ b/2022 - LA - Space Wolves.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ca15-13de-89cb-bbb2" name="LA -   VI: Space Wolves" revision="42" battleScribeVersion="2.03" authorName="Mr_Dark, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="ca15-13de-89cb-bbb2" name="LA -   VI: Space Wolves" revision="43" battleScribeVersion="2.03" authorName="Mr_Dark, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="ff53-69d9-ec0b-9caa" name="VI: Space Wolves" hidden="false" collective="false" import="false" targetId="4916-965e-8339-44f6" type="selectionEntry">
       <modifiers>
@@ -4594,6 +4594,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7414-6453-5515-19e2" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="7187-69c2-8781-5cc0" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="a383-6968-6a76-f4b7" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -4624,6 +4629,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d23b-1841-6398-dc15" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="cc1d-f46c-acca-5e97" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="0631-4584-8cff-0af1" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="17"/>
@@ -4693,6 +4703,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="eae2-8852-4045-61ca" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="e765-9f76-54fc-f184" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="e8b2-2863-893d-2db8" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -4860,13 +4875,6 @@
                       </entryLinks>
                     </selectionEntryGroup>
                   </selectionEntryGroups>
-                  <entryLinks>
-                    <entryLink id="d6ee-cefb-93a1-9fb2" name="Bolt Pistol" hidden="false" collective="false" import="true" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
-                      <constraints>
-                        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3156-e23b-074b-9b16" type="max"/>
-                      </constraints>
-                    </entryLink>
-                  </entryLinks>
                 </selectionEntryGroup>
                 <selectionEntryGroup id="5ae3-f552-811e-6462" name="1) Shield or Bolter" hidden="false" collective="false" import="true" defaultSelectionEntryId="d95d-82be-5371-4f68">
                   <constraints>
@@ -4887,6 +4895,13 @@
                 <categoryLink targetId="59a4-7b61-600a-c457" id="af4a-67f1-4879-b561" name="Skirmish Sub-type" primary="false"/>
                 <categoryLink targetId="6399-5c65-7833-1025" id="5563-6509-48aa-87d2" name="Line Sub-type" primary="false"/>
               </categoryLinks>
+              <entryLinks>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="1b40-c8fd-da81-8871" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="ae65-e750-3492-7e28" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
+              </entryLinks>
             </selectionEntry>
             <selectionEntry id="c830-ff75-317f-45c1" name="Grey Slayer w/Bolter, Power Axe" hidden="false" collective="false" import="true" type="model">
               <constraints>
@@ -4936,6 +4951,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bfa6-73ab-2d13-f936" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="f183-ac62-9e1e-e2e3" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="eb32-2e83-08df-fa06" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -4994,6 +5014,11 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                   </costs>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="786f-6732-540f-e15a" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="a21e-f5c8-4a02-f78f" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -5052,6 +5077,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a8c8-1871-8795-2733" type="max"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="6c0a-be29-55e7-d426" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="be5c-9228-2d5e-8749" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -5110,6 +5140,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9156-a7c3-dc9a-10a0" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="5ace-fde7-e06e-2809" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="23c7-d078-3358-8fd9" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -5140,6 +5175,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b1be-c891-1265-6638" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="87b5-f2be-78c1-83ec" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="75ef-1586-42f6-b998" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="17"/>
@@ -5170,6 +5210,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a00c-8d09-1472-f62d" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="33aa-68fa-82e4-b47b" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="ef93-6a0d-f731-22fe" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="17"/>
@@ -5200,6 +5245,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2e93-76ef-b675-1e56" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="7037-c16d-a015-63c3" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="3254-0ff7-790a-8986" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="17"/>
@@ -5668,6 +5718,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dd0e-148f-dbaa-545e" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="0416-e427-af1e-0b7c" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="91e8-b7fd-a29c-eb9a" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="14"/>
@@ -5695,6 +5750,11 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                   </costs>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="470a-de3f-32d2-0694" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="0026-4959-e383-cbcb" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -5722,6 +5782,11 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                   </costs>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="c94d-0ae9-c82b-1916" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="d0a7-53a9-a0c8-93fe" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -5749,6 +5814,11 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                   </costs>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="4e82-af90-d2f4-a4f1" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="1676-74bd-fa47-96ff" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -5776,6 +5846,11 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="5"/>
                   </costs>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="ff9d-2378-45f0-0653" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="9db1-ced3-4d83-535d" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
@@ -5958,13 +6033,6 @@
                       </entryLinks>
                     </selectionEntryGroup>
                   </selectionEntryGroups>
-                  <entryLinks>
-                    <entryLink id="eeed-bc3a-bfe5-9417" name="Bolt Pistol" hidden="false" collective="false" import="true" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
-                      <constraints>
-                        <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a8ca-7ffe-5924-e3dc" type="max"/>
-                      </constraints>
-                    </entryLink>
-                  </entryLinks>
                 </selectionEntryGroup>
                 <selectionEntryGroup id="f5f5-deb7-dccb-53d9" name="3) Heavy/Special Weapon (1 in 5)" hidden="false" collective="false" import="true">
                   <modifiers>
@@ -6078,6 +6146,13 @@
                 <categoryLink targetId="59a4-7b61-600a-c457" id="5581-c7a3-464f-9bb2" name="Skirmish Sub-type" primary="false"/>
                 <categoryLink targetId="6399-5c65-7833-1025" id="1197-0cee-4633-86ee" name="Line Sub-type" primary="false"/>
               </categoryLinks>
+              <entryLinks>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="12f7-f0c5-cd9d-e6af" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="04f6-3e65-f545-1dd8" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
+              </entryLinks>
             </selectionEntry>
             <selectionEntry id="2472-8f6f-6df0-19b9" name="Grey Stalker w/ Chainsword" hidden="false" collective="false" import="true" type="model">
               <constraints>
@@ -6093,6 +6168,11 @@
                     <constraint field="selections" scope="parent" value="1" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="089f-7c35-b77a-75ad" type="min"/>
                   </constraints>
                 </entryLink>
+                <entryLink import="true" name="Bolt Pistol" hidden="false" id="1cd4-04bd-e428-ff09" collective="false" targetId="e5ae-6872-37aa-8600" type="selectionEntry">
+                  <constraints>
+                    <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="5b54-bc05-9bbe-8551" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
+                  </constraints>
+                </entryLink>
               </entryLinks>
               <costs>
                 <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="12"/>
diff --git a/2022 - LA - Thousand Sons.cat b/2022 - LA - Thousand Sons.cat
index ce00c581..9ec702f2 100644
--- a/2022 - LA - Thousand Sons.cat	
+++ b/2022 - LA - Thousand Sons.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="abac-8dd1-df65-e253" name="LA -  XV: Thousand Sons" revision="40" battleScribeVersion="2.03" authorName="Arkangelmark5" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="abac-8dd1-df65-e253" name="LA -  XV: Thousand Sons" revision="41" battleScribeVersion="2.03" authorName="Arkangelmark5" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <publications>
     <publication id="f743-7ff9-a2f3-01c7" name="Exemplary Battles of the Age of Darkness: The Axandria IV Incident" shortName="Axandria IV" publisher="Exemplary Battles of the Age of Darkness: The Axandria IV Incident" publicationDate="9/16/2022" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2022/09/3mVvZrTG9XOWeVxv.pdf"/>
   </publications>
@@ -3212,6 +3212,11 @@
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
                   </costs>
                 </entryLink>
+                <entryLink import="true" name="Æther-Fire Blaster" hidden="false" id="ab71-f78e-787b-4760" type="selectionEntry" targetId="d078-5f42-c02b-c73d">
+                  <costs>
+                    <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
+                  </costs>
+                </entryLink>
               </entryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
diff --git a/2022 - LA - White Scars.cat b/2022 - LA - White Scars.cat
index ba144b3f..350b3772 100644
--- a/2022 - LA - White Scars.cat	
+++ b/2022 - LA - White Scars.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="caa9-c50e-8eed-2259" name="LA -   V: White Scars" revision="45" battleScribeVersion="2.03" authorName="Mr_Dark, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="caa9-c50e-8eed-2259" name="LA -   V: White Scars" revision="46" battleScribeVersion="2.03" authorName="Mr_Dark, UrsinePatriarch" authorContact="BSData Developers Discord" library="false" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="67" type="catalogue">
   <entryLinks>
     <entryLink id="a738-6a11-dfe7-286c" name="V: White Scars" hidden="false" collective="false" import="false" targetId="e01e-5cdd-e512-8353" type="selectionEntry">
       <modifiers>
@@ -5573,7 +5573,7 @@ May join units that include models with the Cavalry Unit Type despite the usual
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
           </costs>
         </entryLink>
-        <entryLink id="bf48-0cda-8aec-9387" name="Power Weapon" hidden="false" collective="false" import="true" targetId="8d9c-9f80-c0fd-adcf" type="selectionEntry"/>
+        <entryLink id="bf48-0cda-8aec-9387" name="Power Weapon" hidden="false" collective="false" import="true" targetId="8d9c-9f80-c0fd-adcf" type="selectionEntry" defaultAmount="1"/>
         <entryLink id="d287-203f-e90d-8a25" name="Power Fist" hidden="false" collective="false" import="true" targetId="768d-b89b-7328-d749" type="selectionEntry">
           <costs>
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="10"/>
diff --git a/2022 - LI - Assassins.cat b/2022 - LI - Assassins.cat
index 42b6fd13..3a96bdc4 100644
--- a/2022 - LI - Assassins.cat	
+++ b/2022 - LI - Assassins.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="4c88-1a81-7e53-0a67" name="LI - Assassins and Agents" revision="15" battleScribeVersion="2.03" authorName="Maye Gelt" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="4c88-1a81-7e53-0a67" name="LI - Assassins and Agents" revision="16" battleScribeVersion="2.03" authorName="Maye Gelt" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="70" type="catalogue">
   <sharedSelectionEntries>
     <selectionEntry id="c1fd-3919-f4bf-a990" name="Clade Adamus Assassin" publicationId="15a4-fc68-502d-48a9" page="120" hidden="false" collective="false" import="true" type="unit">
       <profiles>
@@ -917,6 +917,9 @@
       <costs>
         <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="0"/>
       </costs>
+      <constraints>
+        <constraint type="max" value="1" field="selections" scope="force" shared="true" id="feb5-7765-c83e-abba" includeChildSelections="false"/>
+      </constraints>
     </selectionEntry>
     <selectionEntry id="4a00-03d4-a850-884b" name="Cults Abominatio" hidden="false" collective="false" import="true" type="upgrade">
       <entryLinks>
diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
index 95d356c5..1be48bf2 100644
--- a/2022 - Legiones Astartes.cat	
+++ b/2022 - Legiones Astartes.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="6393-649c-7213-a327" name="Legions Astartes" revision="205" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="6393-649c-7213-a327" name="Legions Astartes" revision="206" battleScribeVersion="2.03" authorName="Various" authorUrl="https://github.com/BSData/horus-heresy" library="true" gameSystemId="28d4-bd2e-4858-ece6" gameSystemRevision="71" type="catalogue">
   <publications>
     <publication id="0594-a9b0-6f10-090e" name="Legion Javelin Squadron update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/hd7WOnm2lKCHkskG.pdf"/>
     <publication id="acdb-27b7-6b7e-932f" name="Legion Mastodon update" publisher="Warhammer Community Downloads" publicationDate="May 2023" publisherUrl="https://www.warhammer-community.com/wp-content/uploads/2023/05/AopGHpxowuowkwJw.pdf"/>
@@ -2995,7 +2995,7 @@ During a Reaction made in any Phase, a player may not choose to activate a model
       </profiles>
       <infoLinks>
         <infoLink id="c4a1-2af0-dd45-581e" name="Gets Hot" hidden="false" targetId="679f-9d97-5ace-a652" type="rule"/>
-        <infoLink id="f02f-c925-7617-114a" name="Two-handed" hidden="false" targetId="4c23-e863-a569-7617" type="rule"/>
+        <infoLink id="f02f-c925-7617-114a" name="Twin-linked" hidden="false" targetId="8542-ee9d-e2fa-52fe" type="rule"/>
         <infoLink id="30ec-1835-cd1c-dfb9" name="Breaching (X)" hidden="false" targetId="a760-f736-1bf3-fa3c" type="rule">
           <modifiers>
             <modifier type="set" field="name" value="Breaching (4+)"/>
@@ -67448,7 +67448,7 @@ In addition, if Xiaphas Jurr is selected as the army’s Warlord in a Blackshiel
                 <characteristic name="T" typeId="c32b-5fdd-3fbe-9b1f">4</characteristic>
                 <characteristic name="W" typeId="57ee-1126-32a9-5672">4</characteristic>
                 <characteristic name="I" typeId="62d3-22d7-2d49-52dc">5</characteristic>
-                <characteristic name="A" typeId="f111-2ce5-dd12-d6b0">4</characteristic>
+                <characteristic name="A" typeId="f111-2ce5-dd12-d6b0">3</characteristic>
                 <characteristic name="Ld" typeId="e8a6-1da9-d384-8727">10</characteristic>
                 <characteristic name="Save" typeId="e593-6b3c-f169-04f0">2+</characteristic>
               </characteristics>
@@ -70521,7 +70521,7 @@ Any Solar Auxilia Rifles Sections included through the use of the Overseer’s R
             <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
           </costs>
         </entryLink>
-        <entryLink id="4123-9851-52ba-4f34" name="Power Weapon" hidden="false" collective="false" import="true" targetId="8d9c-9f80-c0fd-adcf" type="selectionEntry"/>
+        <entryLink id="4123-9851-52ba-4f34" name="Power Weapon" hidden="false" collective="false" import="true" targetId="8d9c-9f80-c0fd-adcf" type="selectionEntry" defaultAmount="1"/>
         <entryLink id="391a-a1cd-2a6c-88dd" name="Raven&apos;s Talon" hidden="true" collective="false" import="true" targetId="09d8-64f5-1936-e8ab" type="selectionEntry">
           <modifiers>
             <modifier type="set" field="d2ee-04cb-5f8a-2642" value="5">
diff --git a/tests/tests.py b/tests/tests.py
index 95934bc1..f3fcb57a 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -123,7 +123,7 @@ def test_verify_no_ros_files(self):
     def test_crusade_6_errors(self):
         self.load_list('Empty Validation Test')
         errors = self.get_error_list()
-        self.assertEqual(6, len(errors), "There should be 6 errors in an empty crusade force org marine list")
+        self.assertEqual(6, len(errors), "There should be 7 errors in an empty crusade force org marine list")
 
     def test_dt_does_not_affect_squad_cost(self):
         self.load_list('Dedicated Transport Squad Costs')