diff --git a/Beastmen.cat b/Beastmen.cat
index 86c5cb0..26cebcb 100644
--- a/Beastmen.cat
+++ b/Beastmen.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="4d5f-a723-f233-6849" name="Beastmen" revision="24" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="4d5f-a723-f233-6849" name="Beastmen" revision="25" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="3c04-36bf-f9ef-7deb" name="Gift of Chaos">
@@ -3915,7 +3915,7 @@
                 <infoLink id="75c6-af49-1dee-11b8" name="Poisoned Attacks" hidden="false" targetId="fefd-9cb0-d6fa-e2ef" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="2.0"/>
+                <cost name="pts" typeId="points" value="1.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
diff --git a/Bretonnia.cat b/Bretonnia.cat
index 6fd63e2..7125270 100644
--- a/Bretonnia.cat
+++ b/Bretonnia.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b575-9224-4fce-6de1" name="Bretonnia" revision="26" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b575-9224-4fce-6de1" name="Bretonnia" revision="27" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="5706-c82a-69e3-ce8a" name="Virtue of the Chivalric Knight">
@@ -2884,7 +2884,7 @@ Defensive Stakes are treated as Defended Obstacles, and remain on the table duri
                 <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
                 <characteristic name="I" typeId="7cca-e51f-edc2-7322">4</characteristic>
                 <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">1</characteristic>
-                <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>
+                <characteristic name="LD" typeId="a199-f10b-a038-5730">6</characteristic>
                 <characteristic name="Type" typeId="13f9-a26b-05af-3459">Cavalry</characteristic>
               </characteristics>
             </profile>
@@ -3108,7 +3108,7 @@ Defensive Stakes are treated as Defended Obstacles, and remain on the table duri
                 <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="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">Infantry</characteristic>
               </characteristics>
@@ -9527,7 +9527,7 @@ on the battlefield at the start of your magic phase, add 1 dice to your power po
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Hex</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">8+/12+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">12&quot;/18&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Remains in play. Tagets all enemy units within range. The target units must pass a LD test or count as having failed a Stupidity test in their next Movement phase. If they are in close combat, they will have their WS lowered to 1 instead. For as long as this spell is active, all enemy units must keep taking this LD at the start of each turn.</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Remains in play. The target becomes subject to Stupidity. Boosted version halves the LD when taking the Stupidity test.</characteristic>
       </characteristics>
     </profile>
     <profile id="cc2d-e0dd-d257-2bfe" name="Doom of Dol" publicationId="9e23-79cb-pubN75312" page="177" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
diff --git a/Chaos_Dwarfs.cat b/Chaos_Dwarfs.cat
index 39ca852..eade682 100644
--- a/Chaos_Dwarfs.cat
+++ b/Chaos_Dwarfs.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="634c-4455-82da-0471" name="Chaos Dwarfs" revision="19" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="634c-4455-82da-0471" name="Chaos Dwarfs" revision="20" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="e151-a589-4fd4-2c1e" name="Animosity Chart">
@@ -3850,7 +3850,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                 <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
                 <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
                 <characteristic name="I" typeId="7cca-e51f-edc2-7322">2</characteristic>
-                <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">1</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">Infantry</characteristic>
               </characteristics>
@@ -3958,7 +3958,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                     <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
                     <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
                     <characteristic name="I" typeId="7cca-e51f-edc2-7322">2</characteristic>
-                    <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">2</characteristic>
+                    <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">3</characteristic>
                     <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>
                     <characteristic name="Type" typeId="13f9-a26b-05af-3459">Infantry</characteristic>
                   </characteristics>
diff --git a/Daemons_of_Chaos.cat b/Daemons_of_Chaos.cat
index 91a6dbb..e6d849d 100644
--- a/Daemons_of_Chaos.cat
+++ b/Daemons_of_Chaos.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="452f-70ac-20f9-baed" name="Daemons of Chaos" revision="23" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="452f-70ac-20f9-baed" name="Daemons of Chaos" revision="24" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="efb3-d0de-5567-f01a" name="Daemonic Gift">
@@ -3543,7 +3543,7 @@
             <infoLink id="da27-ea6a-7c28-dc97" name="Blue Horror" hidden="false" targetId="cdf7-faff-b736-2ca4" type="profile"/>
           </infoLinks>
           <costs>
-            <cost name="pts" typeId="points" value="13.0"/>
+            <cost name="pts" typeId="points" value="12.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="4858-d0aa-5c5f-3185" name="Wizard Level 1" hidden="false" collective="false" import="true" type="upgrade">
diff --git a/Dark_Elves.cat b/Dark_Elves.cat
index 3cbc318..43328e7 100644
--- a/Dark_Elves.cat
+++ b/Dark_Elves.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="1194-2922-b8ab-2f1d" name="Dark Elves" revision="27" 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="31" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="1194-2922-b8ab-2f1d" name="Dark Elves" revision="28" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="4d67-b1d7-6891-ce0e" name="Gift of Khaine">
@@ -2665,9 +2665,9 @@ For each unsaved Wound caused by Disciple in close combat, he gains +1 to cast i
         <categoryLink id="3a59-bf9e-6270-2307" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="7637-851b-8007-06cf" name="City Guard (First Ranks)" hidden="false" collective="false" import="true" type="model">
+        <selectionEntry id="7637-851b-8007-06cf" name="City Guard" 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="7d85-bb29-a31b-d1ee" type="min"/>
+            <constraint field="selections" scope="parent" value="10.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7d85-bb29-a31b-d1ee" type="min"/>
           </constraints>
           <infoLinks>
             <infoLink id="8824-e8d4-e43d-3831" name="Elven Grace" hidden="false" targetId="8c96-c7fe-2a85-f2f9" type="rule"/>
@@ -2689,18 +2689,6 @@ For each unsaved Wound caused by Disciple in close combat, he gains +1 to cast i
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="0dd3-2d01-f023-42ff" name="Repeater Crossbow" 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="e4b2-30ef-9fc9-12dc" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="41c4-3294-083e-afc4" type="max"/>
-              </constraints>
-              <infoLinks>
-                <infoLink id="7310-8165-92bf-7fcf" name="Repeater Crossbow" hidden="false" targetId="92df-4d61-e793-1d63" type="profile"/>
-              </infoLinks>
-              <costs>
-                <cost name="pts" typeId="points" value="3.0"/>
-              </costs>
-            </selectionEntry>
             <selectionEntry id="53da-87a0-2ed5-0f91" 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="72a9-d8f0-64f7-5c62" type="max"/>
@@ -2713,58 +2701,41 @@ For each unsaved Wound caused by Disciple in close combat, he gains +1 to cast i
               </costs>
             </selectionEntry>
           </selectionEntries>
-          <costs>
-            <cost name="pts" typeId="points" value="9.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="e773-87fc-6260-1a67" name="City Guard (Other Ranks)" 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="c78d-98da-128c-26dc" type="min"/>
-          </constraints>
-          <infoLinks>
-            <infoLink id="6f2d-89b6-0354-9e42" name="Elven Grace" hidden="false" targetId="8c96-c7fe-2a85-f2f9" type="rule"/>
-            <infoLink id="6fec-a9e3-bf25-2087" name="Murderous Prowess" hidden="false" targetId="1451-9754-507c-44a8" type="rule"/>
-            <infoLink id="e02b-eba6-21e8-6451" name="Mixed Formation" hidden="false" targetId="b3ad-14ab-b631-e50d" type="rule"/>
-            <infoLink id="735b-692d-d32c-365b" name="City Guard" hidden="false" targetId="5f01-04b5-c4a7-b54e" type="profile"/>
-            <infoLink id="1390-c809-6abc-91bf" name="Hatred (High Elves)" hidden="false" targetId="a0a3-ddd4-b1ed-1054" type="rule"/>
-          </infoLinks>
-          <selectionEntries>
-            <selectionEntry id="5768-4d2a-cd46-5e78" 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="630f-a20a-3fd3-b136" type="max"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c782-4c1f-a2ad-b9c4" type="min"/>
-              </constraints>
-              <infoLinks>
-                <infoLink id="5466-acd0-7588-ced4" 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="a753-6729-831c-4502" name="Spear (On Foot)" 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="6e52-a49b-ebcc-ffc5" type="max"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9ff1-8543-412b-6d0a" type="min"/>
-              </constraints>
-              <infoLinks>
-                <infoLink id="745d-d1f7-25af-17cc" name="Spear (Infantry)" hidden="false" targetId="be39-37ac-ac20-5053" type="profile"/>
-              </infoLinks>
-              <costs>
-                <cost name="pts" typeId="points" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="202e-327a-d668-d6aa" name="Shield" hidden="false" collective="true" import="true" type="upgrade">
+          <selectionEntryGroups>
+            <selectionEntryGroup id="5343-eadb-4274-466f" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="a8c5-553c-8704-d27c">
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1ffb-eefd-272f-7f4f" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f247-da9c-a624-c13b" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1cc7-fd29-a8b2-8ec4" type="min"/>
               </constraints>
-              <infoLinks>
-                <infoLink id="f0ec-e22a-e78a-6cb1" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
-              </infoLinks>
-              <costs>
-                <cost name="pts" typeId="points" value="1.0"/>
-              </costs>
-            </selectionEntry>
-          </selectionEntries>
+              <selectionEntries>
+                <selectionEntry id="437e-8375-7eef-41e5" name="Hand Weapon &amp; Repeater Crossbow" 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="0cf8-6b52-f268-23b8" type="min"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d62c-ef9a-9fb6-5b1d" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="c1cd-9bd1-67ed-fdae" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
+                    <infoLink id="9b7d-9b80-ab61-1612" name="Repeater Crossbow" hidden="false" targetId="92df-4d61-e793-1d63" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="3.0"/>
+                  </costs>
+                </selectionEntry>
+                <selectionEntry id="a8c5-553c-8704-d27c" name="Spear (On Foot)" 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="b21c-5e9c-2646-e975" type="min"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="79ad-dd12-113f-3095" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="f743-66c4-2bc2-62b9" name="Spear (On Foot)" hidden="false" targetId="be39-37ac-ac20-5053" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
           <costs>
             <cost name="pts" typeId="points" value="9.0"/>
           </costs>
@@ -8368,8 +8339,7 @@ following Close Combat phase.</characteristic>
       <description>A Black Dragon has a S 3 Breath Weapon. All models in a unit that has suffered one or more casualties from the attack suffers a -1 penalty to their WD and BS until the end of the following turn.</description>
     </rule>
     <rule id="b3ad-14ab-b631-e50d" name="Mixed Formation" publicationId="9e23-79cb-pubN76150" page="122" hidden="false">
-      <description>All City Guard armed with Repeater Crossbows must be placed in the first ranks of the unit, with the City Guard armed with spears being placed in the following ranks. Models armed with Repeater Crossbows and shields cannot make Parry saves. Casualties are removed from the back as normal. Half the models in the unit (rounding down) must replace their
-spears with repeater crossbows.</description>
+      <description>All City Guard armed with Repeater Crossbows must be placed in the first ranks of the unit, with the City Guard armed with spears being placed in the following ranks. Models armed with Repeater Crossbows and shields cannot make Parry saves. Casualties are removed from the back as normal. Half the models in the unit (rounding down) must replace their spears with repeater crossbows.</description>
     </rule>
     <rule id="fb7f-921b-b1e1-a5e7" name="Khainite" publicationId="9e23-79cb-pubN76150" page="114" hidden="false">
       <description>Characters who are Khainites (except models deploying using Hidden) may only join units which are also Khainites, and characters who are not Khainites may not join Khainite units.</description>
diff --git a/Lizardmen.cat b/Lizardmen.cat
index 0763d11..4a7861f 100644
--- a/Lizardmen.cat
+++ b/Lizardmen.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="199b-5495-f6b6-fe0f" name="Lizardmen" revision="25" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="199b-5495-f6b6-fe0f" name="Lizardmen" revision="26" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="8f38-4096-41a1-bd68" name="Discipline of the Old Ones">
@@ -2307,9 +2307,6 @@
           </conditions>
         </modifier>
       </modifiers>
-      <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="c7d2-3e82-9f05-2ee1" type="max"/>
-      </constraints>
       <categoryLinks>
         <categoryLink id="fcb0-b56f-effb-e368" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
       </categoryLinks>
@@ -5872,9 +5869,6 @@ If the artillery dice result is a misfire, no shots are fired and D3 Skink Handl
           </conditions>
         </modifier>
       </modifiers>
-      <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="878d-dd16-7341-b773" type="max"/>
-      </constraints>
       <categoryLinks>
         <categoryLink id="18fb-3435-f1b8-3618" name="New CategoryLink" hidden="false" targetId="fc26-7737-f7cb-8977" primary="true"/>
       </categoryLinks>
@@ -6544,7 +6538,7 @@ If the artillery dice result is a misfire, no shots are fired and D3 Skink Handl
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2e36-7c9a-c94c-7498" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="03fb-650a-f8b2-4dbc" name="Blessed Spawnings" hidden="false" collective="false" import="true" targetId="Blessed Spawnings" type="selectionEntryGroup"/>
+                <entryLink id="03fb-650a-f8b2-4dbc" name="Blessed Spawnings (Units 2 Blessings)" hidden="false" collective="false" import="true" targetId="59cf-94e4-d520-853b" type="selectionEntryGroup"/>
               </entryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="1.0"/>
diff --git a/Nippon.cat b/Nippon.cat
index 040545d..213fc30 100644
--- a/Nippon.cat
+++ b/Nippon.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="e275-bf7b-24ea-92f1" name="Nippon" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="e275-bf7b-24ea-92f1" name="Nippon" revision="16" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="59f8-f38c-0bdd-cc1d" name="Poison">
@@ -5496,6 +5496,18 @@ I and A as well as a Ward save (5+) for the remainder of the turn.</characterist
                     <cost name="pts" typeId="points" value="0.0"/>
                   </costs>
                 </selectionEntry>
+                <selectionEntry id="12ae-486c-a58d-1808" name="Throwing Weapons" 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="25bb-4989-2e67-1fe2" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d929-5c4b-e79a-c1ea" type="min"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="1ec8-6361-e68d-86a8" name="Throwing Weapons" hidden="false" targetId="fdcd-6526-0b8e-b291" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
               </selectionEntries>
               <costs>
                 <cost name="pts" typeId="points" value="200.0"/>
diff --git a/Ogre_Kingdoms.cat b/Ogre_Kingdoms.cat
index 4aef1f6..876480a 100644
--- a/Ogre_Kingdoms.cat
+++ b/Ogre_Kingdoms.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="e12f-c1a5-402a-77ae" name="Ogre Kingdoms" revision="26" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="e12f-c1a5-402a-77ae" name="Ogre Kingdoms" revision="27" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="dcfb-308c-d238-54ac" name="Big Name">
@@ -4465,20 +4465,7 @@ If a misfire is rolled on the first artillery dice, roll a D6 and consult the Ir
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="22e0-f532-647a-e0ac" type="atLeast"/>
           </conditions>
         </modifier>
-        <modifier type="set" field="14d3-c3c6-ef35-1d5d" value="0.0">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ca7a-8a16-e227-97aa" type="atLeast"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0e47-e4fa-0867-d196" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
       </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="14d3-c3c6-ef35-1d5d" type="max"/>
-      </constraints>
       <categoryLinks>
         <categoryLink id="f4e4-4a18-0836-76d0" name="New CategoryLink" hidden="false" targetId="b876-2856-f1c2-c4f0" primary="true"/>
       </categoryLinks>
@@ -4600,22 +4587,9 @@ If a misfire is rolled on the first artillery dice, roll a D6 and consult the Ir
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="22e0-f532-647a-e0ac" type="atLeast"/>
           </conditions>
         </modifier>
-        <modifier type="set" field="3917-d8d3-c412-0ea2" value="0.0">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ca7a-8a16-e227-97aa" type="atLeast"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0e47-e4fa-0867-d196" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
       </modifiers>
-      <constraints>
-        <constraint field="selections" scope="force" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="3917-d8d3-c412-0ea2" type="max"/>
-      </constraints>
       <infoLinks>
-        <infoLink id="6fc6-6e53-ce0e-fabb" name="Grimhorn Rhinox Riders" hidden="false" targetId="d5f3-5568-962d-6ae9" type="rule"/>
+        <infoLink id="6fc6-6e53-ce0e-fabb" name="Rhinox" hidden="false" targetId="d5f3-5568-962d-6ae9" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9cdf-f2e0-c8e1-3a07" name="New CategoryLink" hidden="false" targetId="fc26-7737-f7cb-8977" primary="true"/>
diff --git a/Skaven.cat b/Skaven.cat
index b406bff..9299786 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="31" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="28da-4dfe-fb43-8a0c" name="Skaven" revision="32" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="4d5d-95c5-9736-ddda" name="Ringing the Bell Table">
@@ -155,7 +155,8 @@
         </selectionEntry>
         <selectionEntry id="51b3-e39a-31ff-7b44" name="Wizard Level 4" 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="3968-0ce1-9d7c-bc16" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3968-0ce1-9d7c-bc16" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="59a2-c493-9277-cd19" type="max"/>
           </constraints>
           <profiles>
             <profile id="ba39-7b5e-85a7-e3b7" name="Grey Seer" publicationId="4086-1ccd-f433-39a2" page="147" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -1020,7 +1021,7 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                     </selectionEntry>
                   </selectionEntries>
                   <selectionEntryGroups>
-                    <selectionEntryGroup id="8c9a-8d5b-ce73-07e0" name="Lore of Magic" hidden="false" collective="false" import="true">
+                    <selectionEntryGroup id="8c9a-8d5b-ce73-07e0" name="Lore of Magic" hidden="false" collective="false" import="true" defaultSelectionEntryId="407c-1069-d38f-7808">
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="32fc-3944-a789-0505" type="min"/>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7804-335d-d938-73a2" type="max"/>
@@ -1332,7 +1333,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
         </selectionEntry>
         <selectionEntry id="c5ae-3281-3f06-74c0" name="Wizard Level 2" 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="4f22-672f-504b-49bf" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4f22-672f-504b-49bf" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0161-a51e-b950-14d2" type="max"/>
           </constraints>
           <profiles>
             <profile id="0dc0-2674-29ae-0e10" name="Plague Lord" publicationId="4086-1ccd-f433-39a2" page="163" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -1927,6 +1929,7 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
         <selectionEntry id="eebf-bf18-a8cd-643b" name="Wizard Level 3" 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="610d-3031-aef0-0086" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9702-f379-3c09-d214" type="min"/>
           </constraints>
           <profiles>
             <profile id="3d2f-a39d-1285-9eb7" name="Warlock Master" publicationId="4086-1ccd-f433-39a2" page="189" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -5492,7 +5495,7 @@ T test or suffer a Wound. On the To Hit roll of a 1, the Globadier hits himself
                     <profile id="f3ed-4fc1-cd5b-6e37" name="Windlaunchers" publicationId="4086-1ccd-f433-39a2" page="186" hidden="false" typeId="781d-35fe-dd22-05d6" typeName="War Machine">
                       <characteristics>
                         <characteristic name="Type" typeId="6081-ebe8-e15b-4e82">Stone Thrower</characteristic>
-                        <characteristic name="Range" typeId="1c88-efb0-083f-b945">6-24&quot;</characteristic>
+                        <characteristic name="Range" typeId="1c88-efb0-083f-b945">8-36&quot;</characteristic>
                         <characteristic name="Strength" typeId="6ca0-d074-628f-e276"/>
                         <characteristic name="Special Rules" typeId="d3a4-721b-f750-5564">Ignores Armour saves. Magical Attacks.</characteristic>
                       </characteristics>
@@ -5969,7 +5972,8 @@ If you roll a misfire result something has gone awry. No more shots are fired th
         </selectionEntry>
         <selectionEntry id="f93b-8845-4c75-165b" name="Wizard Level 3" 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="03ce-d913-0a53-a309" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="03ce-d913-0a53-a309" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="203a-7b7b-2f02-488e" type="max"/>
           </constraints>
           <profiles>
             <profile id="e82f-23dd-bf8f-800d" name="Eshin Sorcerer Lord" publicationId="4086-1ccd-f433-39a2" page="175" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
diff --git a/Warriors_of_Chaos.cat b/Warriors_of_Chaos.cat
index 5f58ce5..7faa766 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="25" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="d5f5-ad84-7e47-d02e" name="Warriors of Chaos" revision="26" 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="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>https://discordapp.com/invite/UrrPB3T</readme>
   <profileTypes>
     <profileType id="49dc-2fd8-b942-dbc2" name="Chaos Mutations and Powers">
@@ -6646,7 +6646,7 @@
                 </selectionEntry>
                 <selectionEntry id="3ef4-b65b-c6e2-950a" name="Chaos Mutations, Powers &amp; Magic Items" hidden="false" collective="false" import="true" type="upgrade">
                   <modifiers>
-                    <modifier type="set" field="e5e1-cef5-41f2-a9f3" value="0.0">
+                    <modifier type="set" field="5476-ed1f-83b7-6194" value="25.0">
                       <conditions>
                         <condition field="selections" scope="0226-69de-0af4-a4da" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7c3b-e40e-8bae-fd0c" type="atLeast"/>
                       </conditions>
@@ -24261,7 +24261,7 @@ that do not roll To Hit.</characteristic>
     </profile>
     <profile id="a631-99f6-e75a-5a8d" name="Chaos Shrine Bearers" publicationId="1a01-044f-047b-618f" page="193" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
       <characteristics>
-        <characteristic name="M" typeId="09ad-18df-607b-1215"></characteristic>
+        <characteristic name="M" typeId="09ad-18df-607b-1215"/>
         <characteristic name="WS" typeId="f049-8a65-9c04-1559">3</characteristic>
         <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
         <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>