diff --git a/Aeldari - Aeldari Library.cat b/Aeldari - Aeldari Library.cat
index ac043bf..4f9e911 100644
--- a/Aeldari - Aeldari Library.cat	
+++ b/Aeldari - Aeldari Library.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="dfcf-1214-b57-2205" name="Aeldari - Aeldari Library" revision="20" battleScribeVersion="2.03" library="true" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="dfcf-1214-b57-2205" name="Aeldari - Aeldari Library" revision="21" battleScribeVersion="2.03" library="true" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
   <publications>
     <publication id="442c-a37c-3908-d701" name="Index: Aeldari" shortName="I:Aeldari" publisher="Index: Aeldari" publicationDate="6/15/2023"/>
     <publication id="1427-7c5c-863f-ac94" name="Index: Drukhari" shortName="I:Drukhari" publisher="Index: Drukhari" publicationDate="6/15/2023"/>
@@ -12112,6 +12112,16 @@ You can attach this unit to the above unit, even if one other Leader unit (excl
             <characteristic name="Description" typeId="9b8f-694b-e5e-b573">While an enemy unit is within 6&quot; of this model, each time a Battle-shock or Leadership test is taken for that enemy unit, subtract 1 from that test.</characteristic>
           </characteristics>
         </profile>
+        <profile name="Haemonculus" typeId="c547-1836-d8a-ff4f" typeName="Unit" hidden="false" id="c548-ca20-498a-b19f">
+          <characteristics>
+            <characteristic name="M" typeId="e703-ecb6-5ce7-aec1">7&quot;</characteristic>
+            <characteristic name="T" typeId="d29d-cf75-fc2d-34a4">4</characteristic>
+            <characteristic name="SV" typeId="450-a17e-9d5e-29da">6+</characteristic>
+            <characteristic name="W" typeId="750a-a2ec-90d3-21fe">5</characteristic>
+            <characteristic name="LD" typeId="58d2-b879-49c7-43bc">6+</characteristic>
+            <characteristic name="OC" typeId="bef7-942a-1a23-59f8">1</characteristic>
+          </characteristics>
+        </profile>
       </profiles>
       <infoLinks>
         <infoLink name="Leader" hidden="false" type="rule" id="e766-d8ae-1c37-18df" targetId="b4dd-3e1f-41cb-218f"/>
@@ -17122,6 +17132,42 @@ You can attach this model to one of the above units, even if one other Leader u
           </constraints>
         </selectionEntry>
       </selectionEntries>
+      <modifiers>
+        <modifier type="set" value="true" field="hidden">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition type="atLeast" value="1" field="selections" scope="force" childId="ffed-8509-9bf7-820e" shared="true" includeChildSelections="true"/>
+                    <condition type="atLeast" value="1" field="selections" scope="force" childId="7d34-c046-e08f-13e1" shared="true" includeChildSelections="true"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+              <conditions>
+                <condition type="atLeast" value="1" field="forces" scope="roster" childId="1d6e-2579-8e7f-1ed4" shared="true"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
+        <modifier type="set" value="1" field="aa83-44e2-b45f-7d08">
+          <conditions>
+            <condition type="atLeast" value="1" field="forces" scope="roster" childId="1d6e-2579-8e7f-1ed4" shared="true"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <infoLinks>
+        <infoLink id="39ca-a30a-3b36-96f1" name="Strands of Fate" hidden="false" targetId="c324-e193-e23c-7d2e" type="rule">
+          <modifiers>
+            <modifier type="set" value="true" field="hidden">
+              <conditions>
+                <condition type="instanceOf" value="1" field="selections" scope="ancestor" childId="7d34-c046-e08f-13e1" shared="true" id="832d-f410-5f42-2f72"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </infoLink>
+      </infoLinks>
+      <comment>Model categories and cost are set in child catalogue</comment>
     </selectionEntry>
     <selectionEntry type="upgrade" import="false" name="Detachment" hidden="false" id="68f1-24f4-a4c6-303f">
       <entryLinks>
diff --git a/Aeldari - Craftworlds.cat b/Aeldari - Craftworlds.cat
index 603143e..2c8998f 100644
--- a/Aeldari - Craftworlds.cat	
+++ b/Aeldari - Craftworlds.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="34a5-8c7e-f468-82d1" name="Aeldari - Craftworlds" revision="3" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="34a5-8c7e-f468-82d1" name="Aeldari - Craftworlds" revision="4" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
   <entryLinks>
     <entryLink id="f3ea-ade3-be6-a95" name="Wraithguard" hidden="false" collective="false" import="true" targetId="5aa4-107-d7ee-f0f3" type="selectionEntry"/>
     <entryLink id="de48-1fed-57fe-c097" name="Windriders" hidden="false" collective="false" import="true" targetId="592a-b255-6c58-19ec" type="selectionEntry"/>
@@ -49,10 +49,16 @@
     <entryLink import="true" name="Voidweaver" hidden="false" type="selectionEntry" id="564c-f5b6-f456-c7c2" targetId="e011-d99d-f0de-5289"/>
     <entryLink import="true" name="Vypers" hidden="false" type="selectionEntry" id="860c-99de-5711-8c0" targetId="d5e3-30bd-71e8-314b"/>
     <entryLink import="true" name="War Walkers" hidden="false" type="selectionEntry" id="12a5-37d7-300e-2173" targetId="309a-28be-6cc6-a37c"/>
-    <entryLink import="true" name="Warlock" hidden="false" type="selectionEntry" id="a502-4dbe-d0c6-69fd" targetId="291f-2885-4512-f0cd">
+    <entryLink import="true" name="Warlock" hidden="false" type="selectionEntry" id="a502-4dbe-d0c6-69fd" targetId="ab89-7505-ff1e-4ed">
       <categoryLinks>
-        <categoryLink targetId="a67a-77cf-f6e3-390a" id="5a9f-f23d-8cb4-6fd2" primary="false" name="Warlock"/>
+        <categoryLink targetId="cf47-a0d7-7207-29dc" id="1710-1344-8452-8a57" primary="false" name="Infantry"/>
+        <categoryLink targetId="9cfd-1c32-585f-7d5c" id="cd67-c168-a002-96a9" primary="true" name="Character"/>
+        <categoryLink targetId="13bf-2bee-3ae0-b414" id="249e-724f-e253-818" primary="false" name="Psyker"/>
+        <categoryLink targetId="a67a-77cf-f6e3-390a" id="2696-afd8-d427-f9a8" primary="false" name="Warlock"/>
       </categoryLinks>
+      <costs>
+        <cost name="pts" typeId="51b2-306e-1021-d207" value="45"/>
+      </costs>
     </entryLink>
     <entryLink import="true" name="Warlock Conclave" hidden="false" type="selectionEntry" id="95cc-3f6-f56b-3638" targetId="d61-c058-6bd1-112f"/>
     <entryLink import="true" name="Warlock Skyrunner Conclave" hidden="false" type="selectionEntry" id="1eaa-4ce0-b46e-f5" targetId="ecfe-8994-b61e-f1c5"/>
diff --git a/Aeldari - Ynnari.cat b/Aeldari - Ynnari.cat
index 72fb00b..307ada7 100644
--- a/Aeldari - Ynnari.cat	
+++ b/Aeldari - Ynnari.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="1f1-47f9-a3a4-9bfb" name="Aeldari - Ynnari" revision="6" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="1f1-47f9-a3a4-9bfb" name="Aeldari - Ynnari" revision="7" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
   <entryLinks>
     <entryLink id="3f04-147d-a258-897d" name="Yvraine" hidden="false" collective="false" import="true" targetId="ada5-25ce-d5d5-4ccb" type="selectionEntry">
       <constraints>
@@ -63,7 +63,17 @@
     <entryLink id="a205-7e9d-5dbc-f57b" name="Voidweaver" hidden="false" collective="false" import="true" targetId="e011-d99d-f0de-5289" type="selectionEntry"/>
     <entryLink id="eec-5ee0-f7c5-fa1f" name="Vypers" hidden="false" collective="false" import="true" targetId="d5e3-30bd-71e8-314b" type="selectionEntry"/>
     <entryLink id="fcd5-3116-77c3-ca2" name="War Walkers" hidden="false" collective="false" import="true" targetId="309a-28be-6cc6-a37c" type="selectionEntry"/>
-    <entryLink id="212d-8c5c-fc58-8b9e" name="Warlock" hidden="false" collective="false" import="true" targetId="291f-2885-4512-f0cd" type="selectionEntry"/>
+    <entryLink id="212d-8c5c-fc58-8b9e" name="Warlock" hidden="false" collective="false" import="true" targetId="ab89-7505-ff1e-4ed" type="selectionEntry">
+      <costs>
+        <cost name="pts" typeId="51b2-306e-1021-d207" value="45"/>
+      </costs>
+      <categoryLinks>
+        <categoryLink targetId="cf47-a0d7-7207-29dc" id="2865-b9c7-7dbd-a54f" primary="false" name="Infantry"/>
+        <categoryLink targetId="9cfd-1c32-585f-7d5c" id="b411-16b8-3f0b-5ef2" primary="true" name="Character"/>
+        <categoryLink targetId="13bf-2bee-3ae0-b414" id="ebec-6008-c97-b52f" primary="false" name="Psyker"/>
+        <categoryLink targetId="a67a-77cf-f6e3-390a" id="8a91-51b3-ec34-d42" primary="false" name="Warlock"/>
+      </categoryLinks>
+    </entryLink>
     <entryLink id="1612-9bda-c991-b559" name="Warlock Conclave" hidden="false" collective="false" import="true" targetId="d61-c058-6bd1-112f" type="selectionEntry"/>
     <entryLink id="8a49-cf7a-31f7-a413" name="Warlock Skyrunner" hidden="false" collective="false" import="true" targetId="b98a-4fbb-a3d8-1ada" type="selectionEntry"/>
     <entryLink id="9166-8030-66a7-d732" name="Warlock Skyrunner Conclave" hidden="false" collective="false" import="true" targetId="ecfe-8994-b61e-f1c5" type="selectionEntry"/>
diff --git a/Imperium - Adeptus Mechanicus.cat b/Imperium - Adeptus Mechanicus.cat
index f578201..055f239 100644
--- a/Imperium - Adeptus Mechanicus.cat	
+++ b/Imperium - Adeptus Mechanicus.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="77b9-2f66-3f9b-5cf3" name="Imperium - Adeptus Mechanicus" revision="10" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="77b9-2f66-3f9b-5cf3" name="Imperium - Adeptus Mechanicus" revision="11" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue">
   <categoryEntries>
     <categoryEntry id="f826-1ad1-a542-2058" name="Archaeopter Fusilave" hidden="false"/>
     <categoryEntry id="37b3-cded-c814-6e63" name="Archaeopter Stratoraptor" hidden="false"/>
@@ -3442,7 +3442,7 @@ as the target of a Stratagem, roll one D6: on a 5+, you gain 1CP.</characteristi
             <characteristic name="Description" typeId="9b8f-694b-e5e-b573">This unit is eligible to shoot and declare a charge in a turn in which it Fell Back, and you can re-roll Desperate Escape tests taken for models in this unit.</characteristic>
           </characteristics>
         </profile>
-        <profile id="2361-39d9-6fbe-27e2" name="Broad spectrum data-tether" hidden="false" typeId="9cc3-6d83-4dd3-9b64" typeName="Abilities">
+        <profile id="2361-39d9-6fbe-27e2" name="Broad Spectrum Data-tether" hidden="false" typeId="9cc3-6d83-4dd3-9b64" typeName="Abilities">
           <characteristics>
             <characteristic name="Description" typeId="9b8f-694b-e5e-b573">Each time you select the bearer as the target of a Stratagem, roll one D6: on a 5+, you gain 1CP.</characteristic>
           </characteristics>
@@ -3478,15 +3478,20 @@ as the target of a Stratagem, roll one D6: on a 5+, you gain 1CP.</characteristi
                     <characteristic name="S" typeId="ab33-d393-96ce-ccba">7</characteristic>
                     <characteristic name="AP" typeId="41a0-1301-112a-e2f2">-2</characteristic>
                     <characteristic name="D" typeId="3254-9fe6-d824-513e">2</characteristic>
-                    <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">Anti-walker 2+, Lance, Sustained Hits 2</characteristic>
+                    <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">Anti-Walker 2+, Lance, Sustained Hits 2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
               <costs>
                 <cost name="pts" typeId="51b2-306e-1021-d207" value="60"/>
               </costs>
+              <infoLinks>
+                <infoLink name="Anti-" hidden="false" type="rule" id="fea9-c01c-d98a-ff7a" targetId="4111-82e3-9444-e942"/>
+                <infoLink name="Lance" hidden="false" type="rule" id="ecf-b28c-dcfb-465e" targetId="2ebc-abdf-8129-6c57"/>
+                <infoLink name="Sustained Hits" hidden="false" type="rule" id="46ff-c451-8317-d7fd" targetId="1897-c22c-9597-12b1"/>
+              </infoLinks>
             </selectionEntry>
-            <selectionEntry id="6b26-05d3-27ed-8b94" name="Sydonian Dragoon (Radium jezzail &amp; Phosphor Serpenta)" hidden="false" collective="false" import="true" type="model">
+            <selectionEntry id="6b26-05d3-27ed-8b94" name="Sydonian Dragoon (Radium jezzail &amp; phosphor serpenta)" hidden="false" collective="false" import="true" type="model">
               <profiles>
                 <profile id="b557-4615-655d-70ec" name="Radium jezzail" hidden="false" typeId="f77d-b953-8fa4-b762" typeName="Ranged Weapons">
                   <characteristics>
@@ -3496,7 +3501,7 @@ as the target of a Stratagem, roll one D6: on a 5+, you gain 1CP.</characteristi
                     <characteristic name="S" typeId="2229-f494-25db-c5d3">5</characteristic>
                     <characteristic name="AP" typeId="9ead-8a10-520-de15">-2</characteristic>
                     <characteristic name="D" typeId="a354-c1c8-a745-f9e3">3</characteristic>
-                    <characteristic name="Keywords" typeId="7f1b-8591-2fcf-d01c">Anti-infantry 3+, Heavy, Precision</characteristic>
+                    <characteristic name="Keywords" typeId="7f1b-8591-2fcf-d01c">Anti-Infantry 3+, Heavy, Precision</characteristic>
                   </characteristics>
                 </profile>
                 <profile id="6f54-f8ac-de6d-1c0c" name="Phosphor Serpenta" hidden="false" typeId="f77d-b953-8fa4-b762" typeName="Ranged Weapons">
@@ -3507,15 +3512,32 @@ as the target of a Stratagem, roll one D6: on a 5+, you gain 1CP.</characteristi
                     <characteristic name="S" typeId="2229-f494-25db-c5d3">5</characteristic>
                     <characteristic name="AP" typeId="9ead-8a10-520-de15">-1</characteristic>
                     <characteristic name="D" typeId="a354-c1c8-a745-f9e3">2</characteristic>
-                    <characteristic name="Keywords" typeId="7f1b-8591-2fcf-d01c">Ignores cover</characteristic>
+                    <characteristic name="Keywords" typeId="7f1b-8591-2fcf-d01c">Ignores Cover</characteristic>
+                  </characteristics>
+                </profile>
+                <profile name="Ironstrider feet" typeId="8a40-4aaa-c780-9046" typeName="Melee Weapons" hidden="false" id="751e-79ad-6116-853c">
+                  <characteristics>
+                    <characteristic name="Range" typeId="914c-b413-91e3-a132">Melee</characteristic>
+                    <characteristic name="A" typeId="2337-daa1-6682-b110">3</characteristic>
+                    <characteristic name="WS" typeId="95d1-95f-45b4-11d6">4+</characteristic>
+                    <characteristic name="S" typeId="ab33-d393-96ce-ccba">5</characteristic>
+                    <characteristic name="AP" typeId="41a0-1301-112a-e2f2">0</characteristic>
+                    <characteristic name="D" typeId="3254-9fe6-d824-513e">1</characteristic>
+                    <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">-</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
               <costs>
                 <cost name="pts" typeId="51b2-306e-1021-d207" value="60"/>
               </costs>
+              <infoLinks>
+                <infoLink name="Ignores Cover" hidden="false" type="rule" id="82f0-36fe-9b59-6bed" targetId="4640-43e7-30b-215a"/>
+                <infoLink name="Anti-" hidden="false" type="rule" id="3f4-ae52-45ad-b9d3" targetId="4111-82e3-9444-e942"/>
+                <infoLink name="Heavy" hidden="false" type="rule" id="d16-96e4-8023-626d" targetId="1202-10a8-78e9-4c67"/>
+                <infoLink name="Precision" hidden="false" type="rule" id="80bc-6c2f-f4e-f1b3" targetId="9143-31ae-e0a6-6007"/>
+              </infoLinks>
             </selectionEntry>
-            <selectionEntry id="54c7-b18a-e3b6-0431" name="Sydonian Dragoon (Taser lance &amp; Phosphor Serpenta)" hidden="false" collective="false" import="true" type="model">
+            <selectionEntry id="54c7-b18a-e3b6-0431" name="Sydonian Dragoon (Taser lance &amp; phosphor serpenta)" hidden="false" collective="false" import="true" type="model">
               <profiles>
                 <profile id="4906-3ae6-9f3e-849b" name="Taser lance" hidden="false" typeId="8a40-4aaa-c780-9046" typeName="Melee Weapons">
                   <characteristics>
@@ -3525,7 +3547,7 @@ as the target of a Stratagem, roll one D6: on a 5+, you gain 1CP.</characteristi
                     <characteristic name="S" typeId="ab33-d393-96ce-ccba">7</characteristic>
                     <characteristic name="AP" typeId="41a0-1301-112a-e2f2">-2</characteristic>
                     <characteristic name="D" typeId="3254-9fe6-d824-513e">2</characteristic>
-                    <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">Anti-walker 2+, Lance, Sustained Hits 2</characteristic>
+                    <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">Anti-Walker 2+, Lance, Sustained Hits 2</characteristic>
                   </characteristics>
                 </profile>
                 <profile id="c4a2-09ec-9d94-c10a" name="Phosphor Serpenta" hidden="false" typeId="f77d-b953-8fa4-b762" typeName="Ranged Weapons">
@@ -3543,6 +3565,12 @@ as the target of a Stratagem, roll one D6: on a 5+, you gain 1CP.</characteristi
               <costs>
                 <cost name="pts" typeId="51b2-306e-1021-d207" value="60"/>
               </costs>
+              <infoLinks>
+                <infoLink name="Ignores Cover" hidden="false" type="rule" id="cbb4-7822-2292-df8e" targetId="4640-43e7-30b-215a"/>
+                <infoLink name="Anti-" hidden="false" type="rule" id="b0c0-a7c8-fb46-b0d6" targetId="4111-82e3-9444-e942"/>
+                <infoLink name="Lance" hidden="false" type="rule" id="1a0e-f447-59be-dc1" targetId="2ebc-abdf-8129-6c57"/>
+                <infoLink name="Sustained Hits" hidden="false" type="rule" id="123d-d515-6033-8e90" targetId="1897-c22c-9597-12b1"/>
+              </infoLinks>
             </selectionEntry>
             <selectionEntry id="015a-6f44-77b2-1207" name="Sydonian Dragoon (Radium jezzail)" hidden="false" collective="false" import="true" type="model">
               <profiles>
@@ -3557,10 +3585,26 @@ as the target of a Stratagem, roll one D6: on a 5+, you gain 1CP.</characteristi
                     <characteristic name="Keywords" typeId="7f1b-8591-2fcf-d01c">Anti-infantry 3+, Heavy, Precision</characteristic>
                   </characteristics>
                 </profile>
+                <profile name="Ironstrider feet" typeId="8a40-4aaa-c780-9046" typeName="Melee Weapons" hidden="false" id="bca8-1ed5-9a50-e87a">
+                  <characteristics>
+                    <characteristic name="Range" typeId="914c-b413-91e3-a132">Melee</characteristic>
+                    <characteristic name="A" typeId="2337-daa1-6682-b110">3</characteristic>
+                    <characteristic name="WS" typeId="95d1-95f-45b4-11d6">4+</characteristic>
+                    <characteristic name="S" typeId="ab33-d393-96ce-ccba">5</characteristic>
+                    <characteristic name="AP" typeId="41a0-1301-112a-e2f2">0</characteristic>
+                    <characteristic name="D" typeId="3254-9fe6-d824-513e">1</characteristic>
+                    <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">-</characteristic>
+                  </characteristics>
+                </profile>
               </profiles>
               <costs>
                 <cost name="pts" typeId="51b2-306e-1021-d207" value="60"/>
               </costs>
+              <infoLinks>
+                <infoLink name="Anti-" hidden="false" type="rule" id="aa85-c25b-a368-a589" targetId="4111-82e3-9444-e942"/>
+                <infoLink name="Heavy" hidden="false" type="rule" id="6628-2f60-ff22-d3b4" targetId="1202-10a8-78e9-4c67"/>
+                <infoLink name="Precision" hidden="false" type="rule" id="818a-e8f1-5f99-4fbf" targetId="9143-31ae-e0a6-6007"/>
+              </infoLinks>
             </selectionEntry>
           </selectionEntries>
         </selectionEntryGroup>
diff --git a/Imperium - Grey Knights.cat b/Imperium - Grey Knights.cat
index f6bc453..e2f34ad 100644
--- a/Imperium - Grey Knights.cat	
+++ b/Imperium - Grey Knights.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="50c4-3e83-fe54-97c4" name="Imperium - Grey Knights" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" revision="9" battleScribeVersion="2.03" type="catalogue">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" library="false" id="50c4-3e83-fe54-97c4" name="Imperium - Grey Knights" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" revision="10" battleScribeVersion="2.03" type="catalogue">
   <catalogueLinks>
     <catalogueLink type="catalogue" name="Imperium - Imperial Knights" id="f3e4-7fc3-8f57-6303" importRootEntries="true" targetId="1b6d-dc06-5db9-c7d1"/>
     <catalogueLink type="catalogue" name="Imperium - Imperial Agents" id="575c-d0f9-7fdc-2ddb" targetId="b00-cd86-4b4c-97ba" importRootEntries="true"/>
@@ -336,6 +336,7 @@
       <infoLinks>
         <infoLink name="Leader" hidden="false" type="rule" id="4740-2ab7-4c53-4e37" targetId="b4dd-3e1f-41cb-218f"/>
         <infoLink name="Deep Strike" hidden="false" type="rule" id="36b8-36f5-d613-ca9e" targetId="7cb5-dd6b-dd87-ad3b"/>
+        <infoLink name="Fights First" hidden="false" type="rule" id="4f48-4dcb-6d3e-72e9" targetId="24-c886-e8ba-5a89"/>
       </infoLinks>
       <selectionEntries>
         <selectionEntry type="upgrade" import="true" name="Nemesis Force Weapon" hidden="false" id="e4f1-7c06-108f-dda3" collective="true">
diff --git a/Imperium - Space Marines.cat b/Imperium - Space Marines.cat
index 244a498..9bd5442 100644
--- a/Imperium - Space Marines.cat	
+++ b/Imperium - Space Marines.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="e0af-67df-9d63-8fb7" name="Imperium - Space Marines" revision="23" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue" authorName="Acebaur">
+<catalogue xmlns="http://www.battlescribe.net/schema/catalogueSchema" id="e0af-67df-9d63-8fb7" name="Imperium - Space Marines" revision="24" battleScribeVersion="2.03" library="false" gameSystemId="sys-352e-adc2-7639-d6a9" gameSystemRevision="1" type="catalogue" authorName="Acebaur">
   <categoryEntries>
     <categoryEntry id="539-7da4-d962-1a64" name="Primaris" hidden="false"/>
     <categoryEntry id="5179-8ede-45e3-49a2" name="Tacticus" hidden="false"/>
@@ -929,12 +929,12 @@
         <profile id="f4f9-d665-21c1-2727" name="Close Combat Weapon" hidden="false" typeId="8a40-4aaa-c780-9046" typeName="Melee Weapons">
           <characteristics>
             <characteristic name="Range" typeId="914c-b413-91e3-a132">Melee</characteristic>
-            <characteristic name="A" typeId="2337-daa1-6682-b110">6</characteristic>
+            <characteristic name="A" typeId="2337-daa1-6682-b110">5</characteristic>
             <characteristic name="WS" typeId="95d1-95f-45b4-11d6">2+</characteristic>
             <characteristic name="S" typeId="ab33-d393-96ce-ccba">4</characteristic>
             <characteristic name="AP" typeId="41a0-1301-112a-e2f2">0</characteristic>
             <characteristic name="D" typeId="3254-9fe6-d824-513e">1</characteristic>
-            <characteristic name="Keywords" typeId="893f-9000-ccf7-648e"/>
+            <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">-</characteristic>
           </characteristics>
         </profile>
       </profiles>
@@ -9645,7 +9645,7 @@ Normal move. If it does so, until the end of the turn, this unit is not eligible
                 <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="8277-328a-6676-23b2"/>
               </constraints>
               <entryLinks>
-                <entryLink import="true" name="Close Combat Weapon" hidden="false" type="selectionEntry" id="d0c4-23f6-8d5c-b7f5" targetId="6c7d-af5b-482-6fbe">
+                <entryLink import="true" name="Close Combat Weapon" hidden="false" type="selectionEntry" id="d0c4-23f6-8d5c-b7f5" targetId="b3b-a615-f023-94ef">
                   <constraints>
                     <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="1c6a-aed0-fe9a-68f"/>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="9ba8-5874-9fa0-1427"/>
@@ -13122,7 +13122,7 @@ Normal move. If it does so, until the end of the turn, this unit is not eligible
                     <entryLink import="true" name="Bolt Pistol" hidden="false" type="selectionEntry" id="4e9d-2724-513d-216a" targetId="b273-b85e-4018-a0cd"/>
                   </entryLinks>
                   <selectionEntries>
-                    <selectionEntry type="upgrade" import="true" name="Heavy Bolt Pistol" hidden="false" id="e353-ff8a-57ca-d6b1" collective="true">
+                    <selectionEntry type="upgrade" import="true" name="Heavy Bolt Pistol" hidden="false" id="e353-ff8a-57ca-d6b1" collective="false">
                       <profiles>
                         <profile name="Heavy Bolt Pistol" typeId="f77d-b953-8fa4-b762" typeName="Ranged Weapons" hidden="false" id="23e6-5720-7f8c-13fa">
                           <characteristics>
@@ -13146,7 +13146,7 @@ Normal move. If it does so, until the end of the turn, this unit is not eligible
                   <entryLinks>
                     <entryLink id="c78b-7930-e387-b421" name="Close Combat Weapon" hidden="false" collective="false" import="true" targetId="6e7b-4796-0ba3-a2d0" type="selectionEntry"/>
                     <entryLink id="fcd2-9360-7c4b-5861" name="Master-crafted Power Weapon" hidden="false" collective="false" import="true" targetId="ebda-08ed-994a-b579" type="selectionEntry"/>
-                    <entryLink id="606a-c7f3-8640-68ba" name="Power Fist" hidden="false" collective="false" import="true" targetId="99de-5985-8cb8-f571" type="selectionEntry"/>
+                    <entryLink id="606a-c7f3-8640-68ba" name="Power Fist" hidden="false" collective="false" import="true" targetId="ae9d-92b6-ba7b-3f52" type="selectionEntry"/>
                   </entryLinks>
                   <constraints>
                     <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="33dc-722d-810c-40e8"/>
@@ -16742,7 +16742,7 @@ You can attach this model to one of the above units even if one Captain, Chapte
             <characteristic name="S" typeId="ab33-d393-96ce-ccba">8</characteristic>
             <characteristic name="AP" typeId="41a0-1301-112a-e2f2">-2</characteristic>
             <characteristic name="D" typeId="3254-9fe6-d824-513e">2</characteristic>
-            <characteristic name="Keywords" typeId="893f-9000-ccf7-648e"/>
+            <characteristic name="Keywords" typeId="893f-9000-ccf7-648e">-</characteristic>
           </characteristics>
         </profile>
       </profiles>