diff --git a/Cult Mechanicus Codex 2015.cat b/Cult Mechanicus Codex 2015.cat
index 0d700105..3371f6c2 100644
--- a/Cult Mechanicus Codex 2015.cat	
+++ b/Cult Mechanicus Codex 2015.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="4fe1-8588-ca35-920b" name="Cult Mechanicus: Codex (2015)" book="Codex: Cult Mechanicus" revision="21" battleScribeVersion="2.00" authorName="True_Hisop" authorContact="" authorUrl="https://github.com/BSData/wh40k/issues" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="20" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="4fe1-8588-ca35-920b" name="Cult Mechanicus: Codex (2015)" book="Codex: Cult Mechanicus" revision="22" battleScribeVersion="2.00" authorName="True_Hisop" authorContact="" authorUrl="https://github.com/BSData/wh40k/issues" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="20" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -52,7 +52,7 @@
       <modifiers/>
       <constraints/>
       <categoryEntries>
-        <categoryEntry id="1cf1-b45d-6839-f3ef" name="HQ" hidden="false">
+        <categoryEntry id="848a6ff2-0def-4c72-8433-ff7da70e6bc7" name="HQ" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -62,7 +62,7 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="true" id="8cca-dafe-dda4-0dad" type="max"/>
           </constraints>
         </categoryEntry>
-        <categoryEntry id="7f11-83df-7d5c-8556" name="Troops" hidden="false">
+        <categoryEntry id="5d76b6f5-20ae-4d70-8f59-ade72a2add3a" name="Troops" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -72,7 +72,7 @@
             <constraint field="selections" scope="parent" value="8.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="true" id="afd2-249f-b8d9-7123" type="max"/>
           </constraints>
         </categoryEntry>
-        <categoryEntry id="6b88-429e-ed43-7a33" name="Elites" hidden="false">
+        <categoryEntry id="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2" name="Elites" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -81,7 +81,7 @@
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="true" id="b3e4-859d-4228-24a5" type="max"/>
           </constraints>
         </categoryEntry>
-        <categoryEntry id="5a7b-09ee-566c-adb0" name="Heavy Support" hidden="false">
+        <categoryEntry id="abf5fd55-9ac7-4263-8bc1-a9fb0a8fa6a6" name="Heavy Support" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -90,7 +90,7 @@
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="true" id="fe9c-a67c-7db7-9dac" type="max"/>
           </constraints>
         </categoryEntry>
-        <categoryEntry id="fef3-38f3-3ee8-947e" name="Fortification" hidden="false">
+        <categoryEntry id="d713cda3-5d0f-40d8-b621-69233263ec2a" name="Fortification" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -2438,42 +2438,42 @@ The Warlord Titan&apos;s carapace-mounted weapons may not target models closer t
     </selectionEntry>
   </selectionEntries>
   <entryLinks>
-    <entryLink id="9516-b596-c6ce-542f" hidden="false" targetId="99eb-e6d9-d466-8d5e" type="selectionEntry" categoryEntryId="5a7b-09ee-566c-adb0">
+    <entryLink id="9516-b596-c6ce-542f" hidden="false" targetId="99eb-e6d9-d466-8d5e" type="selectionEntry" categoryEntryId="abf5fd55-9ac7-4263-8bc1-a9fb0a8fa6a6">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="a96f-9fe1-a8b1-d754" hidden="false" targetId="b12e-945e-63f9-613e" type="selectionEntry" categoryEntryId="7f11-83df-7d5c-8556">
+    <entryLink id="a96f-9fe1-a8b1-d754" hidden="false" targetId="b12e-945e-63f9-613e" type="selectionEntry" categoryEntryId="5d76b6f5-20ae-4d70-8f59-ade72a2add3a">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="427c-a804-3f5c-f652" hidden="false" targetId="faf0-ed0a-e246-e549" type="selectionEntry" categoryEntryId="7f11-83df-7d5c-8556">
+    <entryLink id="427c-a804-3f5c-f652" hidden="false" targetId="faf0-ed0a-e246-e549" type="selectionEntry" categoryEntryId="5d76b6f5-20ae-4d70-8f59-ade72a2add3a">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="cc6d-6764-c32e-c1ed" hidden="false" targetId="a1b3-c303-2051-20f0" type="selectionEntry" categoryEntryId="1cf1-b45d-6839-f3ef">
+    <entryLink id="cc6d-6764-c32e-c1ed" hidden="false" targetId="a1b3-c303-2051-20f0" type="selectionEntry" categoryEntryId="848a6ff2-0def-4c72-8433-ff7da70e6bc7">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="d8cb-9a77-9621-f075" hidden="false" targetId="95c0-9650-abc8-3212" type="selectionEntry" categoryEntryId="6b88-429e-ed43-7a33">
+    <entryLink id="d8cb-9a77-9621-f075" hidden="false" targetId="95c0-9650-abc8-3212" type="selectionEntry" categoryEntryId="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="cfd6-249b-c9e2-4db5" hidden="false" targetId="931d-007d-20f7-5f4b" type="selectionEntry" categoryEntryId="6b88-429e-ed43-7a33">
+    <entryLink id="cfd6-249b-c9e2-4db5" hidden="false" targetId="931d-007d-20f7-5f4b" type="selectionEntry" categoryEntryId="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2">
       <profiles/>
       <rules/>
       <infoLinks/>
diff --git a/Skitarii - Codex.cat b/Skitarii - Codex.cat
index 4b20ea23..9f3384a8 100644
--- a/Skitarii - Codex.cat	
+++ b/Skitarii - Codex.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="2301-1cab-6d58-f23b" name="Skitarii: Codex (2015)" book="Codex: Skitarii" revision="34" battleScribeVersion="2.00" authorName="True_Hisop" authorContact="" authorUrl="https://github.com/BSData/wh40k/issues" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="2301-1cab-6d58-f23b" name="Skitarii: Codex (2015)" book="Codex: Skitarii" revision="35" battleScribeVersion="2.00" authorName="True_Hisop" authorContact="" authorUrl="https://github.com/BSData/wh40k/issues" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -40,7 +40,7 @@
       <modifiers/>
       <constraints/>
       <categoryEntries>
-        <categoryEntry id="6452-606d-c3ca-0758" name="Troops" hidden="false">
+        <categoryEntry id="5d76b6f5-20ae-4d70-8f59-ade72a2add3a" name="Troops" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -50,7 +50,7 @@
             <constraint field="selections" scope="parent" value="8.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="true" id="b1f0-bcab-c2ae-4ae8" type="max"/>
           </constraints>
         </categoryEntry>
-        <categoryEntry id="b6fc-4b93-7ecc-8823" name="Elites" hidden="false">
+        <categoryEntry id="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2" name="Elites" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -59,7 +59,7 @@
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="true" id="1e0b-1376-1d91-bbec" type="max"/>
           </constraints>
         </categoryEntry>
-        <categoryEntry id="c9fb-dcf7-58ab-4f9e" name="Fast Attack" hidden="false">
+        <categoryEntry id="c274d0b0-5866-44bc-9810-91c136ae7438" name="Fast Attack" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -68,7 +68,7 @@
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="true" id="bb5e-3662-8ba6-8cb0" type="max"/>
           </constraints>
         </categoryEntry>
-        <categoryEntry id="dfc0-2629-fddc-93a2" name="Heavy Support" hidden="false">
+        <categoryEntry id="abf5fd55-9ac7-4263-8bc1-a9fb0a8fa6a6" name="Heavy Support" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -77,7 +77,7 @@
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="true" id="e63f-b5d2-7ae4-21fc" type="max"/>
           </constraints>
         </categoryEntry>
-        <categoryEntry id="3396-a47b-a369-54ba" name="Fortification" hidden="false">
+        <categoryEntry id="d713cda3-5d0f-40d8-b621-69233263ec2a" name="Fortification" hidden="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -2935,28 +2935,28 @@ Until the start of your next turn, all friendly models with the Doctrina Imperat
     </selectionEntry>
   </selectionEntries>
   <entryLinks>
-    <entryLink id="dd9f-678a-7b4d-43cf" hidden="false" targetId="fe8a-7e02-959a-7e87" type="selectionEntry" categoryEntryId="6452-606d-c3ca-0758">
+    <entryLink id="dd9f-678a-7b4d-43cf" hidden="false" targetId="fe8a-7e02-959a-7e87" type="selectionEntry" categoryEntryId="5d76b6f5-20ae-4d70-8f59-ade72a2add3a">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="bd33-343a-26b9-d8bf" hidden="false" targetId="4e77-55d8-bbc8-144d" type="selectionEntry" categoryEntryId="c9fb-dcf7-58ab-4f9e">
+    <entryLink id="bd33-343a-26b9-d8bf" hidden="false" targetId="4e77-55d8-bbc8-144d" type="selectionEntry" categoryEntryId="c274d0b0-5866-44bc-9810-91c136ae7438">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="62d8-a74b-9d57-0457" hidden="false" targetId="987c-9f99-920a-0ef5" type="selectionEntry" categoryEntryId="dfc0-2629-fddc-93a2">
+    <entryLink id="62d8-a74b-9d57-0457" hidden="false" targetId="987c-9f99-920a-0ef5" type="selectionEntry" categoryEntryId="c274d0b0-5866-44bc-9810-91c136ae7438">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="6f25-4e1d-599d-ac76" hidden="false" targetId="ac10-3487-63f6-3721" type="selectionEntry" categoryEntryId="dfc0-2629-fddc-93a2">
+    <entryLink id="6f25-4e1d-599d-ac76" hidden="false" targetId="ac10-3487-63f6-3721" type="selectionEntry" categoryEntryId="abf5fd55-9ac7-4263-8bc1-a9fb0a8fa6a6">
       <profiles/>
       <rules/>
       <infoLinks/>
@@ -2970,7 +2970,7 @@ Until the start of your next turn, all friendly models with the Doctrina Imperat
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="db69-33fa-27db-0b6b" hidden="false" targetId="1fa1-8541-dd34-f6e1" type="selectionEntry" categoryEntryId="b6fc-4b93-7ecc-8823">
+    <entryLink id="db69-33fa-27db-0b6b" hidden="false" targetId="1fa1-8541-dd34-f6e1" type="selectionEntry" categoryEntryId="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2">
       <profiles/>
       <rules/>
       <infoLinks/>
@@ -2984,28 +2984,28 @@ Until the start of your next turn, all friendly models with the Doctrina Imperat
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="ed21-f545-22f4-ce30" hidden="false" targetId="8eb2-18d1-a6b7-8f99" type="selectionEntry" categoryEntryId="b6fc-4b93-7ecc-8823">
+    <entryLink id="ed21-f545-22f4-ce30" hidden="false" targetId="8eb2-18d1-a6b7-8f99" type="selectionEntry" categoryEntryId="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="d6b0-7643-2b8a-e614" name="New EntryLink" hidden="false" targetId="abe6-f073-e7b7-7560" type="selectionEntry" categoryEntryId="6452-606d-c3ca-0758">
+    <entryLink id="d6b0-7643-2b8a-e614" name="New EntryLink" hidden="false" targetId="abe6-f073-e7b7-7560" type="selectionEntry" categoryEntryId="5d76b6f5-20ae-4d70-8f59-ade72a2add3a">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="60cf-1630-e021-60dc" name="New EntryLink" hidden="false" targetId="8cf8-701d-d60c-5d93" type="selectionEntry" categoryEntryId="b6fc-4b93-7ecc-8823">
+    <entryLink id="60cf-1630-e021-60dc" name="New EntryLink" hidden="false" targetId="8cf8-701d-d60c-5d93" type="selectionEntry" categoryEntryId="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2">
       <profiles/>
       <rules/>
       <infoLinks/>
       <modifiers/>
       <constraints/>
     </entryLink>
-    <entryLink id="2bb6-6714-639d-6beb" name="New EntryLink" hidden="false" targetId="4609-c966-1649-c1f6" type="selectionEntry" categoryEntryId="b6fc-4b93-7ecc-8823">
+    <entryLink id="2bb6-6714-639d-6beb" name="New EntryLink" hidden="false" targetId="4609-c966-1649-c1f6" type="selectionEntry" categoryEntryId="638d74c6-bd97-4de5-b65a-6aaa24e9f4b2">
       <profiles/>
       <rules/>
       <infoLinks/>