diff --git a/Dwarfs.cat b/Dwarfs.cat
index d170798..ad40645 100644
--- a/Dwarfs.cat
+++ b/Dwarfs.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b378-d254-8745-ba60" name="Dwarfs" revision="12" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b378-d254-8745-ba60" name="Dwarfs" revision="13" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="2bfd-fe7d-294c-9853" name="Rules of the Runes Table">
@@ -3004,7 +3004,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
         <entryLink id="f980-4299-d10e-e39c" name="General" hidden="false" collective="false" import="true" targetId="d322-3c7a-6d1e-7dc2" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="65.0"/>
+        <cost name="pts" typeId="points" value="85.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d7d0-7a64-77b7-d863" name="Dragon Slayer" hidden="false" collective="false" import="true" type="model">
diff --git a/Estalia.cat b/Estalia.cat
index 11d290e..84ac763 100644
--- a/Estalia.cat
+++ b/Estalia.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="290c-8805-073e-3492" name="Estalia" revision="12" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="290c-8805-073e-3492" name="Estalia" revision="13" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="e5cf-9291-e237-c43a" name="Duelling Techniques">
@@ -3978,17 +3978,15 @@
     </selectionEntry>
     <selectionEntry id="73c5-a3cf-0d34-c883" name="Conquistadors" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set-primary" field="category" value="b876-2856-f1c2-c4f0">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b7f4-339d-d2bb-bd1a" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="remove" field="category" value="fc26-7737-f7cb-8977">
+        <modifier type="set" field="982e-8b93-be62-3949" value="0.0">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b7f4-339d-d2bb-bd1a" type="atLeast"/>
           </conditions>
         </modifier>
       </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="-1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="982e-8b93-be62-3949" type="max"/>
+      </constraints>
       <categoryLinks>
         <categoryLink id="4c02-b126-b7d5-90a4" name="New CategoryLink" hidden="false" targetId="fc26-7737-f7cb-8977" primary="true"/>
       </categoryLinks>
@@ -5535,6 +5533,187 @@ When suffering casualties from shooting or magic, the Herders follow the rules f
         <cost name="pts" typeId="points" value="0.0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="7af0-d134-66b6-f301" name="Conquistadors (Francisco Cortez)" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="e4c2-6ff4-fc52-3a72" value="-1.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="b7f4-339d-d2bb-bd1a" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="e4c2-6ff4-fc52-3a72" type="max"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink id="9d50-bcc6-62d4-5551" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
+      </categoryLinks>
+      <selectionEntries>
+        <selectionEntry id="a4c7-6b70-70e7-0cfa" name="Conquistador" hidden="false" collective="false" import="true" type="model">
+          <constraints>
+            <constraint field="selections" scope="parent" value="5.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="acf9-cbf9-1784-f8b3" type="min"/>
+          </constraints>
+          <profiles>
+            <profile id="127a-3215-05dc-6a8f" name="Conquistador" publicationId="894a-5ecc-1ff7-958a" page="62" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+              <characteristics>
+                <characteristic name="M" typeId="09ad-18df-607b-1215">4</characteristic>
+                <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">4</characteristic>
+                <characteristic name="S" typeId="edd2-7979-54a4-6b35">3</characteristic>
+                <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">3</characteristic>
+                <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
+                <characteristic name="I" typeId="7cca-e51f-edc2-7322">3</characteristic>
+                <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">1</characteristic>
+                <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>
+                <characteristic name="Type" typeId="13f9-a26b-05af-3459">Cavalry</characteristic>
+              </characteristics>
+            </profile>
+          </profiles>
+          <infoLinks>
+            <infoLink id="f6b2-011b-fa69-fde6" name="Tactical Supremacy" hidden="false" targetId="988f-a5b4-56b9-dbcb" type="rule"/>
+            <infoLink id="419d-4c98-02b4-aef9" name="Fusillade" hidden="false" targetId="e488-694d-d577-b5d9" type="rule"/>
+          </infoLinks>
+          <selectionEntries>
+            <selectionEntry id="8d61-838c-f1a1-73d9" name="Warhorse" hidden="false" collective="true" import="true" type="model">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b56f-48f5-f286-c6dd" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8b27-af87-83b5-ba34" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="0ec2-7852-172e-31e3" name="Warhorse" hidden="false" targetId="04a2-7e74-a077-da71" type="profile"/>
+                <infoLink id="84e0-b779-41d6-c681" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
+                <infoLink id="153a-f343-5f5f-e564" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="1e8a-08f4-36c2-f4e5" name="Medium Armour" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bc36-bc4a-bfc7-6b5a" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d4e2-3266-28c8-df68" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="7ac8-dba1-9445-7eb4" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="1150-a192-5aa6-0f1f" name="Pistol" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0386-fb60-858a-8c9f" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6677-c32d-8227-a4e5" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="8625-ff89-ee9f-3088" name="Pistol" hidden="false" targetId="aa4f-83e3-8259-924a" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="8508-0426-deaf-6981" name="Handgun" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2a1b-51a8-e525-f6d0" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="11b1-f56d-b50e-0f5a" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="5ebd-1beb-d65b-707a" name="Handgun" hidden="false" targetId="bd57-9e45-342f-ee49" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="0640-5b54-f963-d223" name="Hand Weapon" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f29e-7bf6-2223-e855" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b154-41d0-9ad4-0b0f" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="a11f-c9da-3ca9-d85e" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+          <costs>
+            <cost name="pts" typeId="points" value="24.0"/>
+          </costs>
+        </selectionEntry>
+      </selectionEntries>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="b93d-4732-b869-c287" name="Command Group" hidden="false" collective="false" import="true">
+          <selectionEntries>
+            <selectionEntry id="ea6b-6be1-a660-9468" name="Standard Bearer" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bfd5-2f27-0154-c26f" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="9763-5431-796a-7d3f" name="Standard Bearer" hidden="false" targetId="6002-29d0-d620-1bd0" type="rule"/>
+              </infoLinks>
+              <selectionEntries>
+                <selectionEntry id="6685-781b-a66a-2e67" name="Magic Standard" hidden="false" collective="false" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="401e-3154-62b2-75cb" type="max"/>
+                    <constraint field="points" scope="parent" value="50.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7ab3-1d3b-8da8-31aa" type="max"/>
+                  </constraints>
+                  <entryLinks>
+                    <entryLink id="891a-8f49-9c49-4202" name="Magic Standards" hidden="false" collective="false" import="true" targetId="1182-5614-d9fe-26dc" type="selectionEntryGroup"/>
+                  </entryLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="0447-e7c7-ebec-e465" name="Musician" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="902d-a29f-e5c0-ed95" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="c920-b267-045b-24b7" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="2fd8-3bac-8699-56ae" name="Conquistador Captain" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9987-c9aa-9012-c1a6" type="max"/>
+              </constraints>
+              <profiles>
+                <profile id="549c-6c0a-1e12-7f31" name="Conquistador Captain" publicationId="894a-5ecc-1ff7-958a" page="62" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+                  <characteristics>
+                    <characteristic name="M" typeId="09ad-18df-607b-1215">4</characteristic>
+                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                    <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">4</characteristic>
+                    <characteristic name="S" typeId="edd2-7979-54a4-6b35">3</characteristic>
+                    <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">3</characteristic>
+                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
+                    <characteristic name="I" typeId="7cca-e51f-edc2-7322">3</characteristic>
+                    <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">1</characteristic>
+                    <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>
+                    <characteristic name="Type" typeId="13f9-a26b-05af-3459">Cavalry</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <infoLinks>
+                <infoLink id="6304-24fa-3c09-00c2" name="Champion" hidden="false" targetId="777a-7a64-44fa-a78e" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <costs>
+        <cost name="pts" typeId="points" value="0.0"/>
+      </costs>
+    </selectionEntry>
   </selectionEntries>
   <sharedSelectionEntries>
     <selectionEntry id="1e6f-78c7-468a-3e09" name="Restricted Practise" hidden="false" collective="false" import="true" type="upgrade">
@@ -5572,6 +5751,7 @@ When suffering casualties from shooting or magic, the Herders follow the rules f
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="4cac-b191-45e5-3d5b" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e90d-6fc8-924b-6a1b" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d857-3c00-d1ab-38a1" repeats="1" roundUp="false"/>
+            <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7af0-d134-66b6-f301" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5874-3245-b8d5-d897" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
diff --git a/Hobgoblins.cat b/Hobgoblins.cat
index f1c2ba2..c42fa61 100644
--- a/Hobgoblins.cat
+++ b/Hobgoblins.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="031d-268e-7c63-81b3" name="Hobgoblins" revision="9" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="031d-268e-7c63-81b3" name="Hobgoblins" revision="10" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="f3ee-001b-a3d8-3590" name="Treacherous Gits Table">
@@ -2585,17 +2585,15 @@ Tarkans may also throw their torches 6&quot; against war machines and chariots.
     </selectionEntry>
     <selectionEntry id="3c53-d9d5-489b-f188" name="Keshig" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="remove" field="category" value="fc26-7737-f7cb-8977">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cfaf-74de-223a-e1eb" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="set-primary" field="category" value="b876-2856-f1c2-c4f0">
+        <modifier type="set" field="b913-d67b-8d50-2f49" value="0.0">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cfaf-74de-223a-e1eb" type="atLeast"/>
           </conditions>
         </modifier>
       </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="-1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b913-d67b-8d50-2f49" type="max"/>
+      </constraints>
       <categoryLinks>
         <categoryLink id="2000-5100-3abe-734d" name="New CategoryLink" hidden="false" targetId="fc26-7737-f7cb-8977" primary="true"/>
       </categoryLinks>
@@ -3612,6 +3610,231 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
         <cost name="pts" typeId="points" value="0.0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="3225-a06c-6ac5-24dc" name="Keshig (Hobgobla Khan)" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="46d7-887f-d98c-8a2d" value="-1.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="cfaf-74de-223a-e1eb" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="46d7-887f-d98c-8a2d" type="max"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink id="c638-4c34-cff0-440d" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
+      </categoryLinks>
+      <selectionEntries>
+        <selectionEntry id="f37c-15c4-4df3-4fe8" name="Keshig" hidden="false" collective="false" import="true" type="model">
+          <constraints>
+            <constraint field="selections" scope="parent" value="5.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="33bc-0816-4a8b-7244" type="min"/>
+          </constraints>
+          <profiles>
+            <profile id="af64-bb54-4ef1-b301" name="Keshig" publicationId="92f3-84a1-4644-bc2f" page="33" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+              <characteristics>
+                <characteristic name="M" typeId="09ad-18df-607b-1215">4</characteristic>
+                <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
+                <characteristic name="S" typeId="edd2-7979-54a4-6b35">3</characteristic>
+                <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">3</characteristic>
+                <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
+                <characteristic name="I" typeId="7cca-e51f-edc2-7322">3</characteristic>
+                <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">1</characteristic>
+                <characteristic name="LD" typeId="a199-f10b-a038-5730">7</characteristic>
+                <characteristic name="Type" typeId="13f9-a26b-05af-3459">Cavalry</characteristic>
+              </characteristics>
+            </profile>
+          </profiles>
+          <infoLinks>
+            <infoLink id="6f12-8d95-5a37-a0fa" name="Cowardly Despoilers" hidden="false" targetId="506d-09a3-d6a7-da46" type="rule"/>
+            <infoLink id="c93d-5bb2-d748-c95f" name="Vanguard" hidden="false" targetId="38ba-d48a-be97-f830" type="rule"/>
+            <infoLink id="78c5-5f70-124a-3593" name="Ded Shooty" hidden="false" targetId="a020-c263-df85-0041" type="rule"/>
+          </infoLinks>
+          <selectionEntries>
+            <selectionEntry id="0e3e-9206-8a81-a30d" name="Poisoned Attacks" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1f0a-a291-7b0c-e7cb" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="7715-1bf5-966a-4125" name="Poisoned Attacks" hidden="false" targetId="fefd-9cb0-d6fa-e2ef" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="2.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="bb57-5370-b627-8169" name="Bow" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c1a0-c57f-3051-c970" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="de49-c136-db06-7013" name="Bow" hidden="false" targetId="9dcd-3be8-08b0-96ab" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="2.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="5828-8fca-3246-089f" name="Giant Wolf" hidden="false" collective="true" import="true" type="model">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7745-8e5f-f8f6-e534" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="70d9-200a-62b8-a0af" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="1430-a520-e3f6-f7a7" name="Giant Wolf" hidden="false" targetId="0727-d2d8-3b8e-1c51" type="profile"/>
+                <infoLink id="2d85-37f5-2fe9-af2c" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
+                <infoLink id="46dc-4639-6462-4cf6" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+              </infoLinks>
+              <selectionEntries>
+                <selectionEntry id="c8ce-f576-9005-ad5a" name="Barding" hidden="false" collective="true" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="96fb-d8e7-7ce3-ea5f" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="8b4b-db96-45f5-ca8b" name="Barding" hidden="false" targetId="7228-95d3-3384-f234" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="2.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="a8bc-6b2b-bd4e-eff9" name="Medium Armour" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5852-32c6-0225-071e" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6961-e197-0454-2a9c" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="1f67-2300-b5cd-e4e6" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="2479-ae4f-a53b-9b6e" name="Shield" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="648b-066f-f68f-9808" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5d83-86f7-a202-4e38" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="5ee1-d795-7f6a-4180" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="2b22-f9b5-8d94-19e8" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="66c1-11a3-84f1-6906">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e268-4a14-b352-e2e2" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9a38-f18c-b505-30d5" type="min"/>
+              </constraints>
+              <selectionEntries>
+                <selectionEntry id="66c1-11a3-84f1-6906" name="Lance (Mounted)" hidden="false" collective="true" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5087-32a9-61f2-b8c0" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="0235-16c6-4e65-61b5" name="Lance (Mounted)" hidden="false" targetId="e56e-fedf-c550-5d81" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+                <selectionEntry id="3fa3-9769-6376-fc94" name="Two/Additional Hand Weapons" hidden="false" collective="true" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1d87-dd4d-f2f7-ae86" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="ba66-5f3f-8e5d-2c61" name="Two/Additional Hand Weapons" hidden="false" targetId="4a5d-0b6d-f6ac-fd7d" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
+          <costs>
+            <cost name="pts" typeId="points" value="16.0"/>
+          </costs>
+        </selectionEntry>
+      </selectionEntries>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="fa36-2ccc-1c24-cd77" name="Command Group" hidden="false" collective="false" import="true">
+          <selectionEntries>
+            <selectionEntry id="a826-30b6-907f-0a2a" name="Cherbi" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e239-1f6d-8276-1e08" type="max"/>
+              </constraints>
+              <profiles>
+                <profile id="e261-8828-466f-5469" name="Cherbi" publicationId="92f3-84a1-4644-bc2f" page="33" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+                  <characteristics>
+                    <characteristic name="M" typeId="09ad-18df-607b-1215">4</characteristic>
+                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                    <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
+                    <characteristic name="S" typeId="edd2-7979-54a4-6b35">3</characteristic>
+                    <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">3</characteristic>
+                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
+                    <characteristic name="I" typeId="7cca-e51f-edc2-7322">3</characteristic>
+                    <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">1</characteristic>
+                    <characteristic name="LD" typeId="a199-f10b-a038-5730">7</characteristic>
+                    <characteristic name="Type" typeId="13f9-a26b-05af-3459">Cavalry</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <infoLinks>
+                <infoLink id="fd63-17eb-f9ff-dfcf" name="Champion" hidden="false" targetId="777a-7a64-44fa-a78e" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="02a1-2d09-bde2-3964" name="Musician" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="55fd-c383-697b-85ce" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="07c9-efc0-327d-a0c3" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="8b2e-3935-ea65-600c" name="Standard Bearer" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="430d-6279-9df6-a300" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="0d54-7ba3-0f89-8b35" name="Standard Bearer" hidden="false" targetId="6002-29d0-d620-1bd0" type="rule"/>
+              </infoLinks>
+              <selectionEntries>
+                <selectionEntry id="ee43-776c-e7aa-1892" name="Magic Standard" hidden="false" collective="false" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8562-1f5a-b6dd-8c37" type="max"/>
+                    <constraint field="points" scope="parent" value="50.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="a661-ef7c-5b19-c4fa" type="max"/>
+                  </constraints>
+                  <entryLinks>
+                    <entryLink id="35db-9b68-daa9-fc39" name="Magic Standards" hidden="false" collective="false" import="true" targetId="856e-14b3-600e-fbcd" type="selectionEntryGroup"/>
+                  </entryLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <costs>
+        <cost name="pts" typeId="points" value="0.0"/>
+      </costs>
+    </selectionEntry>
   </selectionEntries>
   <sharedSelectionEntries>
     <selectionEntry id="62b8-32fb-1d79-e521" name="Expendable" hidden="false" collective="false" import="true" type="model">
@@ -3621,6 +3844,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="69e7-0d31-7d02-d1aa" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ad0a-9ff6-7a24-87f5" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="db2a-81e7-eef6-588a" repeats="1" roundUp="false"/>
+            <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="3225-a06c-6ac5-24dc" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
       </modifiers>
diff --git a/Kislev.cat b/Kislev.cat
index 3c17872..1d0abd8 100644
--- a/Kislev.cat
+++ b/Kislev.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="443d-406a-91b3-9788" name="Kislev" revision="11" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="443d-406a-91b3-9788" name="Kislev" revision="12" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="9fbd-5eb3-4c58-bce4" name="Drunken Stupor Table">
@@ -3462,17 +3462,15 @@
     </selectionEntry>
     <selectionEntry id="ea6f-6deb-0f86-79db" name="Gryphon Legion" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set-primary" field="category" value="b876-2856-f1c2-c4f0">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c7b6-4fce-4f8d-6f62" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="remove" field="category" value="fc26-7737-f7cb-8977">
+        <modifier type="set" field="7d7c-aa52-78d1-ce68" value="0.0">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c7b6-4fce-4f8d-6f62" type="atLeast"/>
           </conditions>
         </modifier>
       </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="-1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7d7c-aa52-78d1-ce68" type="max"/>
+      </constraints>
       <categoryLinks>
         <categoryLink id="33d5-5194-2211-54d1" name="New CategoryLink" hidden="false" targetId="fc26-7737-f7cb-8977" primary="true"/>
       </categoryLinks>
@@ -4950,6 +4948,177 @@ If a Misfire is rolled, roll immediately on the Blackpowder Misfire table. If fi
         <cost name="pts" typeId="points" value="0.0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="c950-eecd-d453-7dd6" name="Gryphon Legion (Tordimir Lubovasyn)" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="eba4-11ee-f1c2-537f" value="-1.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c7b6-4fce-4f8d-6f62" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="eba4-11ee-f1c2-537f" type="max"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink id="ca4f-1d73-990c-bcb8" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
+      </categoryLinks>
+      <selectionEntries>
+        <selectionEntry id="0e15-6a45-1973-3fd8" name="Gryphon Legionnaire" hidden="false" collective="false" import="true" type="model">
+          <constraints>
+            <constraint field="selections" scope="parent" value="5.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8535-9214-bb25-b83c" type="min"/>
+          </constraints>
+          <profiles>
+            <profile id="3382-825c-1321-4245" name="Gryphon Legionnaire" publicationId="1607-bfe9-82af-d3dc" page="55" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+              <characteristics>
+                <characteristic name="M" typeId="09ad-18df-607b-1215">4</characteristic>
+                <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
+                <characteristic name="S" typeId="edd2-7979-54a4-6b35">3</characteristic>
+                <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">3</characteristic>
+                <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
+                <characteristic name="I" typeId="7cca-e51f-edc2-7322">3</characteristic>
+                <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">1</characteristic>
+                <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>
+                <characteristic name="Type" typeId="13f9-a26b-05af-3459">Cavalry</characteristic>
+              </characteristics>
+            </profile>
+          </profiles>
+          <infoLinks>
+            <infoLink id="df59-57dc-0ed5-7851" name="Kin of the Bear God" hidden="false" targetId="e7ea-084a-a224-02f2" type="rule"/>
+            <infoLink id="5a5d-dd1a-6c47-bee3" name="Hates Chaos" hidden="false" targetId="210c-334f-bda5-3b20" type="rule"/>
+            <infoLink id="9fd8-ff54-4eb0-8d65" name="Glorious Charge" hidden="false" targetId="a6cf-6dc0-c104-1914" type="rule"/>
+            <infoLink id="a75f-9aee-e6fc-923d" name="Immunity (Psychology)" hidden="false" targetId="b143-056c-658e-ba26" type="rule"/>
+          </infoLinks>
+          <selectionEntries>
+            <selectionEntry id="071f-1c5e-896f-6523" name="Warhorse" hidden="false" collective="true" import="true" type="model">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1993-4daf-d01e-9d5d" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7963-2da2-1073-8db8" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="dc59-3458-8468-4fbe" name="Warhorse" hidden="false" targetId="7806-7f1c-581f-2931" type="profile"/>
+                <infoLink id="09b6-8e96-1d7d-c162" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
+                <infoLink id="515b-bc72-42ec-5e27" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="55f5-86a5-6daf-8cda" name="Shield" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8d75-4f2e-0e8d-d7ef" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c62a-8abd-c41a-362b" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="8cf8-6098-2b67-d62f" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="1f74-7aa4-856f-f7a7" name="Medium Armour" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d4e0-6f60-b85a-12db" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9f9e-9fca-8597-9903" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="8fd2-2418-0010-cfd5" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="83f0-779b-af37-eedf" name="Lance (Mounted)" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7703-06f5-6032-9867" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f2df-df62-6471-cf33" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="005a-5367-10bb-91b7" name="Lance (Mounted)" hidden="false" targetId="e56e-fedf-c550-5d81" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+          <costs>
+            <cost name="pts" typeId="points" value="22.0"/>
+          </costs>
+        </selectionEntry>
+      </selectionEntries>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="bda7-0c53-576d-976d" name="Command Group" hidden="false" collective="false" import="true">
+          <selectionEntries>
+            <selectionEntry id="5c70-4910-a885-412d" name="Standard Bearer" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5406-d652-206d-773e" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="c83b-f9fe-f786-e9d9" name="Standard Bearer" hidden="false" targetId="6002-29d0-d620-1bd0" type="rule"/>
+              </infoLinks>
+              <selectionEntries>
+                <selectionEntry id="918b-407b-0678-5155" name="Magic Standard" hidden="false" collective="false" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9797-fe2d-b263-e43f" type="max"/>
+                    <constraint field="points" scope="parent" value="50.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="c139-d68f-46f0-298a" type="max"/>
+                  </constraints>
+                  <entryLinks>
+                    <entryLink id="26df-a49f-7642-9e3a" name="Magic Standards" hidden="false" collective="false" import="true" targetId="36b5-7e17-a3d6-e5c7" type="selectionEntryGroup"/>
+                  </entryLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="5172-6aca-a78b-c647" name="Musician" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="935e-32b0-df04-42c2" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="3771-fbb8-458b-611c" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="b34b-825f-c556-63c8" name="Rotamaster" hidden="false" collective="false" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eec0-0e22-6430-00d5" type="max"/>
+              </constraints>
+              <profiles>
+                <profile id="4783-d8af-3d3d-627d" name="Rotamaster" publicationId="1607-bfe9-82af-d3dc" page="55" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+                  <characteristics>
+                    <characteristic name="M" typeId="09ad-18df-607b-1215">4</characteristic>
+                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                    <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
+                    <characteristic name="S" typeId="edd2-7979-54a4-6b35">3</characteristic>
+                    <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">3</characteristic>
+                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
+                    <characteristic name="I" typeId="7cca-e51f-edc2-7322">3</characteristic>
+                    <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">2</characteristic>
+                    <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>
+                    <characteristic name="Type" typeId="13f9-a26b-05af-3459">Cavalry</characteristic>
+                  </characteristics>
+                </profile>
+              </profiles>
+              <infoLinks>
+                <infoLink id="5663-9318-73ba-5d85" name="Champion" hidden="false" targetId="777a-7a64-44fa-a78e" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="10.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <costs>
+        <cost name="pts" typeId="points" value="0.0"/>
+      </costs>
+    </selectionEntry>
   </selectionEntries>
   <sharedSelectionEntries>
     <selectionEntry id="5b8c-99ec-47b3-f684" name="Ice-armour of Jekaterina" page="" hidden="false" collective="false" import="true" type="upgrade">
@@ -4979,6 +5148,7 @@ If a Misfire is rolled, roll immediately on the Blackpowder Misfire table. If fi
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="fd18-b0c4-496a-c3af" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5d74-26d2-e41c-05e1" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="66b6-bafb-1da5-d22d" repeats="1" roundUp="false"/>
+            <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c950-eecd-d453-7dd6" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
       </modifiers>
diff --git a/Magic.cat b/Magic.cat
index bdfc38e..4756744 100644
--- a/Magic.cat
+++ b/Magic.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="a579-d41f-e1ad-746f" name="Magic" revision="14" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="true" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="a579-d41f-e1ad-746f" name="Magic" revision="15" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="true" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="9965-cb44-b099-6e8f" name="Foot of Gork Table">
@@ -27143,7 +27143,7 @@
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">6+/12+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">24&quot;/12&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">All attacks against the target unit (shooting or close combat) suffer a -1 penalty To Hit until the start of the caster&apos;s next Magic phase. Shooting attacks that do not use BS must roll 4+ on a D6 before filing, or the shot(s) is lost. Boosted version affects all friendly units within range.</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">All attacks against the target unit (shooting or close combat) suffer a -1 penalty To Hit until the start of the caster&apos;s next Magic phase. Shooting attacks that do not use BS must roll 4+ on a D6 before firing, or the shot(s) is lost. Boosted version affects all friendly units within range.</characteristic>
       </characteristics>
     </profile>
     <profile id="92a3-5235-890d-9fd3" name="The Speed of Light" publicationId="9e23-79cb-pubN66727" page="144" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
@@ -29044,7 +29044,7 @@ under the effect of this spell. Any unit under the effect of the spell is treate
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">5+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">24&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">All attacks against the target unit (shooting or close combat) suffer a -1 penalty To Hit until the start of the caster&apos;s next Magic phase. Shooting attacks that do not use BS must roll 4+ on a D6 before filing, or the shot(s) is lost.</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">All attacks against the target unit (shooting or close combat) suffer a -1 penalty To Hit until the start of the caster&apos;s next Magic phase. Shooting attacks that do not use BS must roll 4+ on a D6 before firing, or the shot(s) is lost.</characteristic>
       </characteristics>
     </profile>
     <profile id="The Speed of Light (Bound Spell)" name="The Speed of Light (Bound Spell)" publicationId="9e23-79cb-pubN66727" page="144" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
diff --git a/Skaven.cat b/Skaven.cat
index 3c29b2c..e504be6 100644
--- a/Skaven.cat
+++ b/Skaven.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="28da-4dfe-fb43-8a0c" name="Skaven" revision="17" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="28da-4dfe-fb43-8a0c" name="Skaven" revision="18" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="2c06-e87d-1a85-d6a0" name="Ringing the Bell Table">
@@ -6942,9 +6942,6 @@ If the marker is under an enemy unit when the Stormfiends emerge, they count as
       </costs>
     </selectionEntry>
     <selectionEntry id="83aa-6169-a3e2-1aac" name="Plagueclaw Catapult" hidden="false" collective="false" import="true" type="model">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9229-0cde-8eaf-be77" type="max"/>
-      </constraints>
       <profiles>
         <profile id="bc09-40da-7b80-9d94" name="Catapult" publicationId="4086-1ccd-f433-39a2" page="166" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
           <characteristics>
diff --git a/Warriors_of_Chaos.cat b/Warriors_of_Chaos.cat
index fe4ac6b..b34266e 100644
--- a/Warriors_of_Chaos.cat
+++ b/Warriors_of_Chaos.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="d5f5-ad84-7e47-d02e" name="Warriors of Chaos" revision="14" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="d5f5-ad84-7e47-d02e" name="Warriors of Chaos" revision="15" battleScribeVersion="2.03" authorName="L3610N 115" authorContact="Contact me on the Warhammer Armies Project Discord (1st link) or on the BSData Developers Discord (2nd link)" authorUrl="https://discordapp.com/invite/AaNyj9s" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="16" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="1306-7f01-ae3c-4fa0" name="Eye of the Gods Table">
@@ -16112,24 +16112,14 @@ The unit&apos;s models gain Poisoned Attacks.</description>
     </selectionEntry>
     <selectionEntry id="a318-4aee-10c0-31b8" name="Chaos Trolls" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="36c4-f2f4-f90c-724a" value="1.0">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9e4-a225-f8ab-b07a" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="set-primary" field="category" value="b876-2856-f1c2-c4f0">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9e4-a225-f8ab-b07a" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="remove" field="category" value="fc26-7737-f7cb-8977">
+        <modifier type="set" field="36c4-f2f4-f90c-724a" value="0.0">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9e4-a225-f8ab-b07a" type="atLeast"/>
           </conditions>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="36c4-f2f4-f90c-724a" type="min"/>
+        <constraint field="selections" scope="force" value="-1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="36c4-f2f4-f90c-724a" type="max"/>
       </constraints>
       <categoryLinks>
         <categoryLink id="773d-e971-07ca-387b" name="New CategoryLink" hidden="false" targetId="fc26-7737-f7cb-8977" primary="true"/>
@@ -18653,6 +18643,109 @@ Beasts, Monstrous Infantry, Monstrous Cavalry, Chariots, War Machines, and Shrin
         <cost name="pts" typeId="points" value="0.0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="8fd5-b603-87ee-d841" name="Chaos Trolls (Throgg)" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="3636-acb8-01e7-401d" value="-1.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9e4-a225-f8ab-b07a" type="atLeast"/>
+          </conditions>
+        </modifier>
+        <modifier type="set" field="006e-d032-48d1-8eea" value="1.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="f9e4-a225-f8ab-b07a" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
+      <constraints>
+        <constraint field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="006e-d032-48d1-8eea" type="min"/>
+        <constraint field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="3636-acb8-01e7-401d" type="max"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink id="eb26-0bd4-29a6-d916" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
+      </categoryLinks>
+      <selectionEntries>
+        <selectionEntry id="3177-903a-2bfa-6536" name="Chaos Troll" hidden="false" collective="false" import="true" type="model">
+          <constraints>
+            <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="033e-379b-da67-c336" type="min"/>
+          </constraints>
+          <rules>
+            <rule id="23ad-f6cf-332a-5d38" name="Troll Vomit" publicationId="1a01-044f-047b-618f" page="198" hidden="false">
+              <description>Instead of attacking normally, the whole unit can choose to vomit on the enemy. Each model inflicts one automatic S 5 hit which Ignores Armour Saves.</description>
+            </rule>
+          </rules>
+          <infoLinks>
+            <infoLink id="9bb5-ff53-9038-05d0" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
+            <infoLink id="2c27-ee0b-ff52-6673" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+            <infoLink id="e7ab-0317-7fb9-7a12" name="Regeneration (4+)" hidden="false" targetId="c21b-d368-6f1c-bae3" type="rule"/>
+            <infoLink id="190f-638d-c578-5b78" name="Stupidity" hidden="false" targetId="755c-61c2-fa25-f4ce" type="rule"/>
+            <infoLink id="3ce5-2233-d60f-c963" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
+            <infoLink id="9846-be6b-1695-d70a" name="Chaos Troll" hidden="false" targetId="974b-bafc-dcc7-8f21" type="profile"/>
+          </infoLinks>
+          <selectionEntries>
+            <selectionEntry id="1fb9-5fa3-8203-2b2d" name="Light Armour" hidden="false" collective="true" import="true" type="upgrade">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="468a-1bf7-2f59-3842" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="58f4-6286-bd1f-67a0" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="3.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="f027-41b1-c24b-168b" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="ed5c-042b-813f-a4ce">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2f42-cf1a-deab-f07d" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f163-cf20-361a-fc60" type="min"/>
+              </constraints>
+              <selectionEntries>
+                <selectionEntry id="1bde-bc15-04f6-1507" name="Great Weapon" hidden="false" collective="true" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7223-1e8b-012c-5e23" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="b3b9-7065-8494-1877" name="Great Weapon" hidden="false" targetId="193e-bc43-b252-8eff" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="6.0"/>
+                  </costs>
+                </selectionEntry>
+                <selectionEntry id="6d85-6fbb-22a9-6887" name="Two/Additional Hand Weapons" hidden="false" collective="true" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c765-45b3-987f-bcaa" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="1360-6c39-b895-7049" name="Two/Additional Hand Weapons" hidden="false" targetId="4a5d-0b6d-f6ac-fd7d" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="3.0"/>
+                  </costs>
+                </selectionEntry>
+                <selectionEntry id="ed5c-042b-813f-a4ce" name="Hand Weapon" hidden="false" collective="true" import="true" type="upgrade">
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="16f1-d0c2-59c3-8342" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="c38e-4c6f-1c85-ce45" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
+          <costs>
+            <cost name="pts" typeId="points" value="40.0"/>
+          </costs>
+        </selectionEntry>
+      </selectionEntries>
+      <costs>
+        <cost name="pts" typeId="points" value="0.0"/>
+      </costs>
+    </selectionEntry>
   </selectionEntries>
   <sharedSelectionEntries>
     <selectionEntry id="7e2e-df30-f192-116f" name="Magic Standard" hidden="false" collective="false" import="true" type="upgrade">
@@ -18689,6 +18782,7 @@ Beasts, Monstrous Infantry, Monstrous Cavalry, Chariots, War Machines, and Shrin
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0f12-de23-0bef-d17f" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="e548-accd-4061-d38f" repeats="1" roundUp="false"/>
             <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="3a3d-4c54-0b30-9438" repeats="1" roundUp="false"/>
+            <repeat field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8fd5-b603-87ee-d841" repeats="1" roundUp="false"/>
           </repeats>
         </modifier>
       </modifiers>