From 95fcaa77921caa2670aef3fcc33c046835f09c84 Mon Sep 17 00:00:00 2001
From: L3610N115 <47950292+L3610N115@users.noreply.github.com>
Date: Sun, 10 May 2020 01:16:37 +0200
Subject: [PATCH] V1.8.0

Updates
Bug fixes
---
 Albion.cat                   |  25 +-
 Amazons.cat                  |  17 +-
 Araby.cat                    |  23 +-
 Beastmen.cat                 | 443 +++++++++++----------------------
 Bretonnia.cat                |  17 +-
 Cathay.cat                   |  72 +++++-
 Chaos_Dwarfs.cat             | 177 ++++++++++---
 Cult_of_Ulric.cat            |  14 +-
 Daemons_of_Chaos.cat         | 148 +++++++----
 Dark_Elves.cat               | 109 ++++++--
 Dogs_of_War.cat              |  54 ++--
 Dwarfs.cat                   | 378 +++++++++++++++++-----------
 Empire.cat                   |  84 ++++---
 Estalia.cat                  |  28 ++-
 Halflings.cat                |   8 +-
 High_Elves.cat               | 307 +++++++++++++++++++----
 Hobgoblins.cat               |  26 +-
 Kingdoms_of_Ind.cat          |  38 ++-
 Kislev.cat                   |  35 ++-
 Lizardmen.cat                |  33 ++-
 Magic.cat                    |  43 ++--
 Nippon.cat                   |  17 +-
 Norse.cat                    |  17 +-
 Ogre_Kingdoms.cat            | 284 ++++++++++-----------
 Orcs__Goblins.cat            | 309 ++++++++++++++++++-----
 Pirates_of_Sartosa.cat       |  14 +-
 Regiments_of_Renown.cat      |  34 ++-
 Skaven.cat                   | 110 +++++----
 Tomb_Kings.cat               | 135 ++++++----
 Vampire_Counts.cat           | 139 +++++++----
 Warhammer_Armies_Project.gst |  47 ++--
 Warriors_of_Chaos.cat        | 467 ++++++++++++++++++++++++++++++++---
 Wood_Elves.cat               | 273 ++++++++++++++++----
 33 files changed, 2628 insertions(+), 1297 deletions(-)

diff --git a/Albion.cat b/Albion.cat
index e717a34..06f8a89 100644
--- a/Albion.cat
+++ b/Albion.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="a10d-a6ff-f7f3-c8c5" name="Albion" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="a10d-a6ff-f7f3-c8c5" name="Albion" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="5483-d421-95cb-121b" name="Big Things Chart (Giant)">
       <characteristicTypes>
@@ -389,7 +389,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -483,7 +484,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1128,7 +1130,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1163,7 +1166,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2478,7 +2482,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2513,7 +2518,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -4244,9 +4250,10 @@
                 <profile id="0a18-3b6d-ebfd-188f" name="Druid Neophyte" publicationId="9e23-79cb-pubN67565" page="73" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e"/>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e"/>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Amazons.cat b/Amazons.cat
index 7cd7e63..3b15584 100644
--- a/Amazons.cat
+++ b/Amazons.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="8267-4947-8aa7-91bc" name="Amazons" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="7" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="8267-4947-8aa7-91bc" name="Amazons" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="37f8-6eb5-3f67-40f1" name="Blessings of Rigg">
       <characteristicTypes>
@@ -244,7 +244,8 @@ magic weapon, roll a D6 for each hit caused by the sword. On a 4+, the enemy’s
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -695,7 +696,8 @@ magic weapon, roll a D6 for each hit caused by the sword. On a 4+, the enemy’s
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -731,7 +733,8 @@ magic weapon, roll a D6 for each hit caused by the sword. On a 4+, the enemy’s
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1266,7 +1269,8 @@ movement phase. If she teleports into contact with an enemy unit, she counts as
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1302,7 +1306,8 @@ movement phase. If she teleports into contact with an enemy unit, she counts as
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Araby.cat b/Araby.cat
index c5b44a0..0c02084 100644
--- a/Araby.cat
+++ b/Araby.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="5054-fb11-bd56-cd58" name="Araby" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="8" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="5054-fb11-bd56-cd58" name="Araby" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="5388-e68f-6e10-6be4" name="Bladedances">
       <characteristicTypes>
@@ -255,7 +255,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -549,7 +550,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -691,7 +693,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -729,7 +732,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1593,7 +1597,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1965,7 +1970,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2003,7 +2009,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Beastmen.cat b/Beastmen.cat
index c3dec8f..c7a5b3a 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="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="4d5f-a723-f233-6849" name="Beastmen" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="3c04-36bf-f9ef-7deb" name="Gift of Chaos">
       <characteristicTypes>
@@ -310,8 +310,9 @@
         </rule>
       </rules>
       <infoLinks>
-        <infoLink id="b19b-b8b5-c95f-02e4" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
+        <infoLink id="b19b-b8b5-c95f-02e4" name="Ambushers" hidden="false" targetId="f366-0f91-841f-cf80" type="rule"/>
         <infoLink id="c514-fcde-faa2-8432" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
+        <infoLink id="402c-5bdf-fc36-219f" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="2b3b-7d18-01da-a0a3" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -568,7 +569,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -685,7 +687,7 @@
       <infoLinks>
         <infoLink id="8fb5-6ed2-e475-487b" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
         <infoLink id="3cf1-84b4-9384-71e8" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
-        <infoLink id="41b5-27fe-ba22-bd6c" name="Ambushers" hidden="false" targetId="f366-0f91-841f-cf80" type="rule"/>
+        <infoLink id="41b5-27fe-ba22-bd6c" name="Beastmen Ambush" hidden="false" targetId="ac57-e28c-5e7b-ba9c" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="fcfe-5d5d-063a-eab5" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -1040,26 +1042,11 @@
           </constraints>
           <selectionEntries>
             <selectionEntry id="55a1-4f23-a963-0981" name="Great Bray-Shaman of Tzeentch" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="014c-3a82-bd2c-530a" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">5</characteristic>
-                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</characteristic>
-                    <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
-                    <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
-                    <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">5</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
-                    <characteristic name="I" typeId="7cca-e51f-edc2-7322">4</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 (Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="d3fb-7a20-ba30-be9f" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
                 <infoLink id="ac60-fa4a-a0c1-bde6" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
                 <infoLink id="c467-47fe-d493-4087" name="Mark of Tzeentch" hidden="false" targetId="62af-86be-bb67-9a3a" type="rule"/>
+                <infoLink id="f5a9-4b11-0a2a-4912" name="Great Bray-Shaman" hidden="false" targetId="b8c9-36fb-c394-d85d" type="profile"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="b3b0-b54b-f495-5e35" name="Magic Items" hidden="false" collective="false" import="true" type="upgrade">
@@ -1117,18 +1104,9 @@
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a673-64dc-38e7-6641" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="fddf-cd5d-d9a0-e60f" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="254e-a49c-ce86-4024" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="101b-685d-943f-a1cb" name="Great Bray-Shaman" hidden="false" targetId="Great Bray-Shaman 4" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="25c6-0816-1c08-0407" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -1149,18 +1127,9 @@
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5558-de52-3b5f-e249" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="ff07-4a50-8e8d-5484" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="5b34-8b98-f952-d1ae" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="fe15-a459-c4f9-7fb6" name="Great Bray-Shaman" hidden="false" targetId="Great Bray-Shaman 3" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="027e-a69e-83d4-d3e4" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -1353,26 +1322,11 @@
               </costs>
             </selectionEntry>
             <selectionEntry id="7a0f-7790-7fbb-d1d3" name="Great Bray-Shaman of Slaanesh" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="22e2-a22f-a2c2-7855" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">5</characteristic>
-                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</characteristic>
-                    <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
-                    <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
-                    <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">5</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
-                    <characteristic name="I" typeId="7cca-e51f-edc2-7322">4</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 (Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="1c9a-4213-e9e2-3b3c" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
                 <infoLink id="d3d5-e045-ecbb-8bf0" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
                 <infoLink id="d099-0979-fe2f-5637" name="Mark of Slaanesh" hidden="false" targetId="2d41-4e7a-af27-6ad1" type="rule"/>
+                <infoLink id="c169-2dd7-e3f9-6489" name="Great Bray-Shaman" hidden="false" targetId="b8c9-36fb-c394-d85d" type="profile"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="84c9-99ce-d4ae-38af" name="Magic Items" hidden="false" collective="false" import="true" type="upgrade">
@@ -1430,18 +1384,9 @@
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2fda-e5a3-9dcc-33e9" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="a9fb-945e-f944-b1f1" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="6673-f344-3846-3854" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="6f8c-bf91-cec4-e63e" name="Great Bray-Shaman" hidden="false" targetId="Great Bray-Shaman 4" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="ebaf-a070-ce23-ea96" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -1462,18 +1407,9 @@
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="740c-26a4-5419-510b" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="b455-4e95-06c8-3465" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="a97f-2280-ea58-2144" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="1d98-81b9-ac2e-81b8" name="Great Bray-Shaman" hidden="false" targetId="Great Bray-Shaman 3" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="810b-ef2f-84b3-c673" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -1666,25 +1602,10 @@
               </costs>
             </selectionEntry>
             <selectionEntry id="b321-03dd-348c-9902" name="Great Bray-Shaman" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="9c42-e4ec-e43e-0d5a" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">5</characteristic>
-                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</characteristic>
-                    <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
-                    <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
-                    <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">5</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
-                    <characteristic name="I" typeId="7cca-e51f-edc2-7322">4</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 (Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
-                <infoLink id="7136-6691-792f-9da6" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
+                <infoLink id="7136-6691-792f-9da6" name="Great Bray-Shaman" hidden="false" targetId="b8c9-36fb-c394-d85d" type="profile"/>
                 <infoLink id="51f4-4a22-ca0a-8063" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
+                <infoLink id="c804-d5fb-396d-e851" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="d760-2fee-6191-e2ea" name="Magic Items" hidden="false" collective="false" import="true" type="upgrade">
@@ -1742,18 +1663,9 @@
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aabc-143c-d9e8-7cde" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="cd8c-f0fc-0801-dbb8" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="2b6c-f1b0-f8f9-d2f4" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="67bb-89fe-0f47-7559" name="Great Bray-Shaman" hidden="false" targetId="Great Bray-Shaman 4" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="ff9a-45f1-3d84-b3f6" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -1777,18 +1689,9 @@
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="12d5-bc82-bed2-5ce6" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="fc7e-bcab-d893-cc98" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
-                        <infoLink id="d9ca-2009-8ccd-bf7f" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="d9ca-2009-8ccd-bf7f" name="Great Bray-Shaman" hidden="false" targetId="Great Bray-Shaman 3" type="profile"/>
+                        <infoLink id="59b1-05eb-c369-190b" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="a917-e72b-739f-0fd5" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -1984,26 +1887,11 @@
               </costs>
             </selectionEntry>
             <selectionEntry id="c387-872c-6bdc-10b4" name="Great Bray-Shaman of Nurgle" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="ffe1-36e9-f016-7998" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">5</characteristic>
-                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</characteristic>
-                    <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
-                    <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
-                    <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">5</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
-                    <characteristic name="I" typeId="7cca-e51f-edc2-7322">4</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 (Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="d335-d657-7846-4917" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
                 <infoLink id="ac8b-0027-0782-511b" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
                 <infoLink id="131d-ea1a-ca1c-51f9" name="Mark of Nurgle" hidden="false" targetId="e111-31f2-8123-8025" type="rule"/>
+                <infoLink id="6371-ec34-d1b4-fae8" name="Great Bray-Shaman" hidden="false" targetId="b8c9-36fb-c394-d85d" type="profile"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="9b8b-a382-0eda-63cf" name="Magic Items" hidden="false" collective="false" import="true" type="upgrade">
@@ -2061,18 +1949,9 @@
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="007f-8582-61fd-4412" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="a21e-92a9-48d4-395e" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="2106-d0b4-3c0e-27f2" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="be22-4ca9-0e1f-63b4" name="Great Bray-Shaman" hidden="false" targetId="Great Bray-Shaman 4" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="300b-d845-53b5-dd34" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -2093,18 +1972,9 @@
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0917-a7cd-03fa-53d7" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="ae18-a895-1337-30a3" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="a86a-8a3a-3307-527b" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="cd04-e48e-32be-980a" name="Great Bray-Shaman" hidden="false" targetId="Great Bray-Shaman 3" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="8db0-6243-6282-e628" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -2661,7 +2531,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -2753,7 +2624,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -3278,25 +3150,11 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
           </constraints>
           <selectionEntries>
             <selectionEntry id="238c-e361-c1fc-4427" name="Bray-Shaman" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="883e-fd3e-22e1-e6a0" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">5</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">4</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">2</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">Infantry (Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="af5c-a45d-4580-41e6" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
                 <infoLink id="3382-6ac1-fa43-8bf0" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
+                <infoLink id="4a21-732b-66a1-db13" name="Bray-Shaman" hidden="false" targetId="eff2-9d53-0083-9e9b" type="profile"/>
+                <infoLink id="2324-6f9d-7170-649b" name="Beastmen Ambush" hidden="false" targetId="ac57-e28c-5e7b-ba9c" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="6829-62e1-5a46-59b1" name="Gifts of Chaos &amp; Magic Items" hidden="false" collective="false" import="true" type="upgrade">
@@ -3339,18 +3197,9 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ac7f-f2cc-8f40-c657" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="9375-4b75-ce6d-c027" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="d9f0-b456-a6a0-0d5f" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="8150-edb9-9c61-5174" name="Bray-Shaman" hidden="false" targetId="Bray-Shaman 2" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="7e84-b51a-a3aa-a56f" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -3374,18 +3223,9 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="df83-3591-c7fa-3b31" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="0d93-be39-071b-aa18" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
-                        <infoLink id="563a-39c9-2b22-7378" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="563a-39c9-2b22-7378" name="Bray-Shaman" hidden="false" targetId="Bray-Shaman 1" type="profile"/>
+                        <infoLink id="811e-33e6-ee36-7031" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="d069-3007-fc69-1683" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -3542,26 +3382,12 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
               </costs>
             </selectionEntry>
             <selectionEntry id="175a-a180-21d3-e5eb" name="Bray-Shaman of Nurgle" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="15aa-cf7a-cf49-4f69" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">5</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">4</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">2</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">Infantry (Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="4f8d-d3e5-c64b-75f2" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
                 <infoLink id="be8a-e69f-ae16-57b1" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
                 <infoLink id="413b-8592-709c-469d" name="Mark of Nurgle" hidden="false" targetId="e111-31f2-8123-8025" type="rule"/>
+                <infoLink id="7196-e7b6-95a0-e487" name="Beastmen Ambush" hidden="false" targetId="ac57-e28c-5e7b-ba9c" type="rule"/>
+                <infoLink id="4fa0-62a3-d7d7-899c" name="Bray-Shaman" hidden="false" targetId="eff2-9d53-0083-9e9b" type="profile"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="3f73-ab32-5d11-ac85" name="Gifts of Chaos &amp; Magic Items" hidden="false" collective="false" import="true" type="upgrade">
@@ -3604,18 +3430,9 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb9a-0d88-28c9-33a7" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="629e-acc8-19db-f69f" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="b813-8e17-6b37-ea76" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="fe50-ab04-6bd7-77cf" name="Bray-Shaman" hidden="false" targetId="Bray-Shaman 2" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="a78f-6f6d-f7da-b734" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -3636,18 +3453,9 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e7e4-cd26-8691-6e90" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="cb6d-c730-de24-8696" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="734d-4389-2f20-bdd1" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="6e39-13d8-88d3-849b" name="Bray-Shaman" hidden="false" targetId="Bray-Shaman 1" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="778e-43a1-480e-c356" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -3801,26 +3609,12 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
               </costs>
             </selectionEntry>
             <selectionEntry id="e078-9469-2695-4806" name="Bray-Shaman of Slaanesh" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="d258-2821-7c1e-c383" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">5</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">4</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">2</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">Infantry (Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="dcc8-ff46-cf3d-9257" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
                 <infoLink id="222e-1925-8ae6-c810" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
                 <infoLink id="8171-3684-604d-bf5a" name="Mark of Slaanesh" hidden="false" targetId="2d41-4e7a-af27-6ad1" type="rule"/>
+                <infoLink id="746c-8ad2-27fa-f01b" name="Beastmen Ambush" hidden="false" targetId="ac57-e28c-5e7b-ba9c" type="rule"/>
+                <infoLink id="e92a-2b69-bef6-2b3a" name="Bray-Shaman" hidden="false" targetId="eff2-9d53-0083-9e9b" type="profile"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="30dc-3b9e-4802-ee1f" name="Gifts of Chaos &amp; Magic Items" hidden="false" collective="false" import="true" type="upgrade">
@@ -3863,18 +3657,9 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6585-5d08-be15-dd7f" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="4290-7a7d-435d-b2b6" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="5013-3249-bc9b-9133" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="bd21-390e-ee58-5ca7" name="Bray-Shaman" hidden="false" targetId="Bray-Shaman 2" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="c588-d4b2-d899-5cfd" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -3895,18 +3680,9 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cf43-10dc-1994-8420" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="88c9-8d2b-7b6d-9792" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="1d64-5385-d491-abc2" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="dd8d-673f-6f74-c5ca" name="Bray-Shaman" hidden="false" targetId="Bray-Shaman 1" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="02f2-fe60-038d-e91e" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -4060,26 +3836,12 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
               </costs>
             </selectionEntry>
             <selectionEntry id="ed97-248f-2dda-9fb3" name="Bray-Shaman of Tzeentch" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="0d2b-df6a-cd5a-116a" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">5</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">4</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">2</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">Infantry (Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="02d4-fe5b-e35a-a01e" name="Primal Fury" hidden="false" targetId="80ca-7f30-49ff-4274" type="rule"/>
                 <infoLink id="6d15-3c23-8563-8509" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
                 <infoLink id="1cb9-f92a-16a5-c6cb" name="Mark of Tzeentch" hidden="false" targetId="62af-86be-bb67-9a3a" type="rule"/>
+                <infoLink id="5f71-9232-b993-6d93" name="Beastmen Ambush" hidden="false" targetId="ac57-e28c-5e7b-ba9c" type="rule"/>
+                <infoLink id="645e-d3f6-a690-cf8d" name="Bray-Shaman" hidden="false" targetId="eff2-9d53-0083-9e9b" type="profile"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="db73-6849-3808-0d7d" name="Gifts of Chaos &amp; Magic Items" hidden="false" collective="false" import="true" type="upgrade">
@@ -4122,18 +3884,9 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4731-df72-8290-0d2c" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="2544-3a36-6344-fa0b" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="c6e4-0fdd-458e-25c3" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="053c-1ab8-d3de-4b16" name="Bray-Shaman" hidden="false" targetId="Bray-Shaman 2" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="2023-baac-b549-8f9b" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -4154,18 +3907,9 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e734-05ec-3eab-c16c" type="max"/>
                       </constraints>
-                      <profiles>
-                        <profile id="64c5-d5f1-c8f7-162b" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
-                          <characteristics>
-                            <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
-                            <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
-                            <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
-                          </characteristics>
-                        </profile>
-                      </profiles>
                       <infoLinks>
                         <infoLink id="05e1-e2fb-9ae6-41c6" name="Result" hidden="false" targetId="Miscast Table" type="profile"/>
+                        <infoLink id="bc1d-d4f0-3281-d1ee" name="Bray-Shaman" hidden="false" targetId="Bray-Shaman 1" type="profile"/>
                       </infoLinks>
                       <selectionEntryGroups>
                         <selectionEntryGroup id="0972-5e19-a596-c383" name="Lore of Magic" hidden="false" collective="false" import="true">
@@ -5121,6 +4865,18 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="22b9-4d8c-3333-00b4" name="Light Armour" 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="80ee-4ad1-1db9-ec75" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="81c2-74e9-eecb-596e" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="f112-3e5b-8b08-96ff" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -5730,7 +5486,7 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
             <infoLink id="e9b0-08db-9e98-6f0e" name="Drunken" hidden="false" targetId="e266-edfb-e9f4-02d1" type="rule"/>
             <infoLink id="f25d-7fb6-fbfa-d98d" name="Result" hidden="false" targetId="b7b0-9a67-5ee2-a8bf" type="profile"/>
             <infoLink id="adc5-44ae-ce03-ff93" name="Strider (Forest)" hidden="false" targetId="8d09-c701-2658-67e8" type="rule"/>
-            <infoLink id="5b8f-b318-8e6c-06a4" name="Ambushers" hidden="false" targetId="f366-0f91-841f-cf80" type="rule"/>
+            <infoLink id="bc9c-e6ab-db5f-ef6e" name="Beastmen Ambush" hidden="false" targetId="ac57-e28c-5e7b-ba9c" type="rule"/>
           </infoLinks>
           <selectionEntries>
             <selectionEntry id="c440-41b1-cb7c-216c" name="Light Armour" hidden="false" collective="true" import="true" type="upgrade">
@@ -5911,7 +5667,8 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
           </constraints>
           <infoLinks>
             <infoLink id="602c-c12b-fbbb-d91e" name="Razorgor" hidden="false" targetId="b564-a41f-f391-8c9e" type="profile"/>
-            <infoLink id="5263-e643-50d7-b53a" name="Thunderous Charge" hidden="false" targetId="0ca0-8541-95c8-2de3" type="rule"/>
+            <infoLink id="5263-e643-50d7-b53a" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
+            <infoLink id="b74e-5b76-8575-79b3" name="Thunderous Charge" hidden="false" targetId="0ca0-8541-95c8-2de3" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -5966,6 +5723,18 @@ against units from the Empire, Bretonnia and Beastmen army books. However, Ungro
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="71d1-8df6-2a1f-7053" name="Light Armour" 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="e2b9-e3df-36d6-def6" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="63c9-368b-d142-8c78" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="246d-88b5-49a0-34d5" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -6227,7 +5996,7 @@ A Spawn of Nurgle has Poisoned Attacks.</description>
             <characteristic name="M" typeId="09ad-18df-607b-1215">6</characteristic>
             <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
             <characteristic name="BS" typeId="7b67-9dfa-eeac-d007"/>
-            <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
+            <characteristic name="S" typeId="edd2-7979-54a4-6b35">5</characteristic>
             <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
             <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
             <characteristic name="I" typeId="7cca-e51f-edc2-7322">5</characteristic>
@@ -6268,7 +6037,7 @@ A Spawn of Nurgle has Poisoned Attacks.</description>
                 </rule>
               </rules>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="de9f-f927-5eb8-9726" name="Insane Bloodlust" hidden="false" collective="false" import="true" type="upgrade">
@@ -6676,7 +6445,7 @@ A Spawn of Nurgle has Poisoned Attacks.</description>
                 <characteristic name="Type" typeId="6081-ebe8-e15b-4e82">Stone Thrower</characteristic>
                 <characteristic name="Range" typeId="1c88-efb0-083f-b945">24&quot;</characteristic>
                 <characteristic name="Strength" typeId="6ca0-d074-628f-e276">4(10)</characteristic>
-                <characteristic name="Special Rules" typeId="d3a4-721b-f750-5564">Multiple Wounds (D6). A Cygor may move in the same turn it uses this ability, though it may not march. A Misfire will do a single wound to the Cygor.</characteristic>
+                <characteristic name="Special Rules" typeId="d3a4-721b-f750-5564">Multiple Wounds (D6). Slow to Fire. A Cygor may move in the same turn it uses this ability, though it may not march. If a misfire is rolled, the Cygor suffers 1 Wound.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -7684,7 +7453,7 @@ Models with this Mark add +1 to their T but suffer -2 to their I.</description>
       <description>All models with this follow the Berserk Rage rules from Frenzy. In addition, if they are forced to charge as a result of a failed Berserk Rage test, they may re-roll failed charge distance results.</description>
     </rule>
     <rule id="ac57-e28c-5e7b-ba9c" name="Beastmen Ambush" publicationId="9e23-79cb-pubN71963" page="62" hidden="false">
-      <description>Beastmen add +1 to any rolls to determine whether or not they enter the table using the Ambushers special rule.</description>
+      <description>Models with this rule have Ambushers, though this is lost if they have any kind of mount. In addition, they add +1 to any rolls to determine whether or not they enter the table when using Ambushers. Note that your Army General must deploy normally.</description>
     </rule>
     <rule id="a0e0-e4fa-1f28-cff8" name="Bagrar the Tamer" publicationId="9e23-79cb-pubN71963" page="98" hidden="false">
       <description>If Gorthor is mounted on a Chariot, he may re-roll all Fleeing and Pursuit distance rolls.</description>
@@ -7702,7 +7471,7 @@ Models with this Mark add +1 to their T but suffer -2 to their I.</description>
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 4+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="00d0-3973-6454-616a" name="Tuskgor" publicationId="9e23-79cb-pubN71963" page="76" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -7730,7 +7499,7 @@ Models with this Mark add +1 to their T but suffer -2 to their I.</description>
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 4+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="5273-0880-563d-0efe" name="Ramhorn" publicationId="9e23-79cb-pubN71963" page="95" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -7815,6 +7584,70 @@ Models with this Mark add +1 to their T but suffer -2 to their I.</description>
         <characteristic name="Special Rules" typeId="9d2e-d14d-dd58-a829">When rolling for the chariot&apos;s impact hits, the Skull of Mugrar allows an extra dice to be rolled, and the highest result to be chosen. In addition, it gives Gorthor Immunity (Multiple Wounds).</characteristic>
       </characteristics>
     </profile>
+    <profile id="Bray-Shaman 1" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
+      <characteristics>
+        <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
+        <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
+        <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
+      </characteristics>
+    </profile>
+    <profile id="Bray-Shaman 2" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
+      <characteristics>
+        <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
+        <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
+        <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
+      </characteristics>
+    </profile>
+    <profile id="eff2-9d53-0083-9e9b" name="Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+      <characteristics>
+        <characteristic name="M" typeId="09ad-18df-607b-1215">5</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">4</characteristic>
+        <characteristic name="W" typeId="27ee-0675-122f-a1b1">2</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">Infantry (Character)</characteristic>
+      </characteristics>
+    </profile>
+    <profile id="b8c9-36fb-c394-d85d" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+      <characteristics>
+        <characteristic name="M" typeId="09ad-18df-607b-1215">5</characteristic>
+        <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</characteristic>
+        <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
+        <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
+        <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">5</characteristic>
+        <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
+        <characteristic name="I" typeId="7cca-e51f-edc2-7322">4</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 (Character)</characteristic>
+      </characteristics>
+    </profile>
+    <profile id="Great Bray-Shaman 3" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
+      <characteristics>
+        <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
+        <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
+        <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
+      </characteristics>
+    </profile>
+    <profile id="Great Bray-Shaman 4" name="Great Bray-Shaman" publicationId="9e23-79cb-pubN71963" page="65" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
+      <characteristics>
+        <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
+        <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
+        <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
+      </characteristics>
+    </profile>
   </sharedProfiles>
   <catalogueLinks>
     <catalogueLink id="ce13-d9d3-12f3-99e1" name="Magic" targetId="a579-d41f-e1ad-746f" type="catalogue" importRootEntries="true"/>
diff --git a/Bretonnia.cat b/Bretonnia.cat
index 35c1ee9..fc381e7 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="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b575-9224-4fce-6de1" name="Bretonnia" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="5706-c82a-69e3-ce8a" name="Virtue of the Chivalric Knight">
       <characteristicTypes>
@@ -369,7 +369,8 @@ suffers a Wound with no saves allowed.</description>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1388,7 +1389,8 @@ Knight is within (or moves into) a forest or water terrain piece during the Rema
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1424,7 +1426,8 @@ Knight is within (or moves into) a forest or water terrain piece during the Rema
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2927,7 +2930,8 @@ Knight is within (or moves into) a forest or water terrain piece during the Rema
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2963,7 +2967,8 @@ Knight is within (or moves into) a forest or water terrain piece during the Rema
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Cathay.cat b/Cathay.cat
index 22d2ba3..2f871ba 100644
--- a/Cathay.cat
+++ b/Cathay.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="aaba-9578-3681-8fdf" name="Cathay" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="aaba-9578-3681-8fdf" name="Cathay" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="7d72-ca7f-447c-58c6" name="Martial Arts Fighting Style">
       <characteristicTypes>
@@ -410,7 +410,8 @@ mounted). For each successful Parry she makes, she may make a single attack back
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -539,6 +540,18 @@ mounted). For each successful Parry she makes, she may make a single attack back
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="3516-07ff-f8c5-e154" 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="0c30-ca70-be8e-8d7e" type="min"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="625c-6a4e-c5c6-eef8" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="ac3b-22ee-6094-5b17" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -849,7 +862,8 @@ mounted). For each successful Parry she makes, she may make a single attack back
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -886,7 +900,8 @@ mounted). For each successful Parry she makes, she may make a single attack back
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1472,7 +1487,8 @@ Points, just like the Battle Standard.</description>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1509,7 +1525,8 @@ Points, just like the Battle Standard.</description>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1651,6 +1668,18 @@ Points, just like the Battle Standard.</description>
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="736c-4d7c-6aae-f354" 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="2fd8-a786-419c-b796" type="min"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5448-8e4c-bde4-9a49" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="6cc0-06e2-7c05-a323" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -4388,6 +4417,18 @@ as an additional attack.</characteristic>
                             <cost name="pts" typeId="points" value="0.0"/>
                           </costs>
                         </selectionEntry>
+                        <selectionEntry id="2aed-f471-8fd3-c021" 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="da08-6360-76e6-abdc" type="min"/>
+                            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="85d8-7815-e99d-5920" type="max"/>
+                          </constraints>
+                          <infoLinks>
+                            <infoLink id="7b4e-56a8-9b4f-aca7" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                          </infoLinks>
+                          <costs>
+                            <cost name="pts" typeId="points" value="0.0"/>
+                          </costs>
+                        </selectionEntry>
                       </selectionEntries>
                       <costs>
                         <cost name="pts" typeId="points" value="0.0"/>
@@ -4475,6 +4516,18 @@ as an additional attack.</characteristic>
                             <cost name="pts" typeId="points" value="0.0"/>
                           </costs>
                         </selectionEntry>
+                        <selectionEntry id="98b0-2935-9e46-c244" 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="53db-5919-8fc0-0369" type="min"/>
+                            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ce47-c682-9197-c0c5" type="max"/>
+                          </constraints>
+                          <infoLinks>
+                            <infoLink id="90b7-cfd4-3dae-39d9" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                          </infoLinks>
+                          <costs>
+                            <cost name="pts" typeId="points" value="0.0"/>
+                          </costs>
+                        </selectionEntry>
                       </selectionEntries>
                       <costs>
                         <cost name="pts" typeId="points" value="0.0"/>
@@ -5924,7 +5977,8 @@ After these hits are resolved, place the Phoenix at the line&apos;s end point. I
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
               </characteristics>
             </profile>
           </profiles>
@@ -6534,7 +6588,7 @@ ball lands, and resolve damage as if it were a Stone Thrower. No Bounce roll is
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 5+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="ef5c-5408-3725-8eea" name="Charioteer" publicationId="8abe-59b3-1084-5e51" page="87" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -6562,7 +6616,7 @@ ball lands, and resolve damage as if it were a Stone Thrower. No Bounce roll is
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 5+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="bda7-d652-0618-ab3e" name="Field Engineer" publicationId="8abe-59b3-1084-5e51" page="85" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
diff --git a/Chaos_Dwarfs.cat b/Chaos_Dwarfs.cat
index 4f38f83..e721cc1 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="5" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="634c-4455-82da-0471" name="Chaos Dwarfs" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="fd1a-59bd-75a6-4a0c" name="Animosity Chart">
       <characteristicTypes>
@@ -221,7 +221,8 @@
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -337,7 +338,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -425,7 +427,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -582,7 +585,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -958,7 +962,8 @@
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -1129,7 +1134,8 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1165,7 +1171,8 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1335,7 +1342,8 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -1763,7 +1771,8 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
               </characteristics>
             </profile>
           </profiles>
@@ -2307,7 +2316,8 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2343,7 +2353,8 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2392,7 +2403,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
             <characteristic name="I" typeId="7cca-e51f-edc2-7322">4</characteristic>
             <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">4</characteristic>
             <characteristic name="LD" typeId="a199-f10b-a038-5730">9</characteristic>
-            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Monstrous Beast (Character)</characteristic>
+            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Monstrous Cavalry (Character)</characteristic>
           </characteristics>
         </profile>
       </profiles>
@@ -2400,7 +2411,8 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
         <infoLink id="523f-8139-e27d-dda4" name="Contempt" hidden="false" targetId="c72b-b137-706f-ad14" type="rule"/>
         <infoLink id="245f-2da3-4786-3be8" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
         <infoLink id="7910-631a-ad5d-2759" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
-        <infoLink id="cf80-5dba-68c8-0f7b" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+        <infoLink id="cf80-5dba-68c8-0f7b" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
+        <infoLink id="686a-8e74-43bb-decc" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="329c-a07e-c89a-b736" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
@@ -3794,7 +3806,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                 <infoLink id="add3-302b-5835-d6a4" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="25c9-426e-f23b-36c0" name="Standard Bearer" hidden="false" collective="false" import="true" type="upgrade">
@@ -3948,7 +3960,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
           </profiles>
           <rules>
             <rule id="5b70-96ef-85c3-1708" name="Fear Elves" publicationId="faf5-2026-3cea-6e96" page="67" hidden="false">
-              <description>Goblins treat all Elves as causing Fear towards them.</description>
+              <description>Models with this rule treat models from Warhammer: High Elves, Dark Elves and Wood Elves rule as causing Fear against them.</description>
             </rule>
           </rules>
           <infoLinks>
@@ -4032,6 +4044,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
               <infoLinks>
                 <infoLink id="040c-a216-f7c5-a71e" name="Champion" hidden="false" targetId="777a-7a64-44fa-a78e" type="rule"/>
                 <infoLink id="6495-5efe-346d-5b9a" name="Hobgoblin Overseer" hidden="false" targetId="d8c0-abb9-b486-7d70" type="profile"/>
+                <infoLink id="675b-cc96-2148-2c66" name="Hobgoblin Overseer" hidden="false" targetId="634d-8f29-d7a7-277b" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
@@ -4080,7 +4093,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
             </profile>
           </profiles>
           <rules>
-            <rule id="206f-defb-c41b-e0eb" name="Ignore Goblin Panic" publicationId="faf5-2026-3cea-6e96" page="67" hidden="false">
+            <rule id="09c5-e6b6-793c-7797" name="Ignore Goblin Panic" publicationId="faf5-2026-3cea-6e96" page="67" hidden="false">
               <description>Orc Slaves treat Goblin Slaves as Expendable.</description>
             </rule>
           </rules>
@@ -4165,6 +4178,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
               <infoLinks>
                 <infoLink id="db22-c75f-47b8-50a3" name="Champion" hidden="false" targetId="777a-7a64-44fa-a78e" type="rule"/>
                 <infoLink id="4a79-5a1c-5044-bd96" name="Hobgoblin Overseer" hidden="false" targetId="d8c0-abb9-b486-7d70" type="profile"/>
+                <infoLink id="63af-c169-401f-a666" name="Hobgoblin Overseer" hidden="false" targetId="634d-8f29-d7a7-277b" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
@@ -4407,7 +4421,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
           </constraints>
           <rules>
             <rule id="76ae-0f55-e061-807f" name=" Petrified Sorcerer" publicationId="faf5-2026-3cea-6e96" page="61" hidden="false">
-              <description>4 Acolytes carry a Petrified Sorcerer. The Petrified Sorcerer may not leave its unit for the duration of the game, and is always placed in the second rank of the unit, as centrally as possible. A Petrified Sorcerer uses the WS and S of the unit carrying it, follows any movement rules they may use and counts as being armed with the same weapons. While there are rank and file models left in the unit, always remove one in preference to the Petrified Sorcerer taking a wound (it is assumed that if one of the bearers falls, another rank and file model steps in). Only when the rest of the unit has been killed does the Petrified Sorcerer start taking wounds, even in close combat. A unit carrying a Petrified Sorcerer gains +1 to their Combat Resolution Bonus, Fear and Magic Resistance (2).</description>
+              <description>The Petrified Sorcerer should be mounted on a 40x40mm base and has Unit Strength 4. It may not leave its unit for the duration of the game, and is always placed in the second rank of the unit, as centrally as possible. While there are rank and file models left in the unit (except the Command Group), always remove one in preference to the Petrified Sorcerer taking a wound. Only when the rest of the unit has been killed does the Petrified Sorcerer start taking wounds, even in close combat. A unit carrying a Petrified Sorcerer gains +1 to their Combat Resolution Bonus, Fear and Magic Resistance (2).</description>
             </rule>
           </rules>
           <infoLinks>
@@ -4645,9 +4659,9 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
           <infoLinks>
             <infoLink id="a585-3bc3-40be-a283" name="Contempt" hidden="false" targetId="c72b-b137-706f-ad14" type="rule"/>
             <infoLink id="fa0d-8951-d9a3-b621" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
-            <infoLink id="a63e-a8fc-2e08-86b2" name="Expendable" hidden="false" targetId="b806-942b-15af-b309" type="rule"/>
             <infoLink id="0e44-4a9c-696a-bc7e" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
             <infoLink id="67e3-a1dd-fe9a-febd" name="Bull Centaur" hidden="false" targetId="243a-dd5d-7fe9-479d" type="profile"/>
+            <infoLink id="a737-b8a8-2294-2e45" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
           </infoLinks>
           <selectionEntryGroups>
             <selectionEntryGroup id="f0e5-5267-b3f6-8bd1" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="e759-5fb2-327f-76a4">
@@ -4822,7 +4836,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                 <characteristic name="I" typeId="7cca-e51f-edc2-7322">3</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">Monstrous Beast</characteristic>
+                <characteristic name="Type" typeId="13f9-a26b-05af-3459">Monstrous Cavalry</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -4831,6 +4845,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
             <infoLink id="44d0-d1fe-e360-f573" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
             <infoLink id="cfdb-6796-2eae-7c8d" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
             <infoLink id="fd5f-4919-eb0c-9b97" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
+            <infoLink id="5c23-c770-b406-dc68" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
           </infoLinks>
           <selectionEntryGroups>
             <selectionEntryGroup id="22be-5e93-788d-836a" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="cf3b-cf58-d131-eb7a">
@@ -5259,7 +5274,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                     <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
                     <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
                     <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-                    <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 4+)</characteristic>
+                    <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 6+)</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -5269,8 +5284,9 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                 </rule>
               </rules>
               <infoLinks>
-                <infoLink id="512f-5b34-9149-cc82" name="Impact Hits (D6)" hidden="false" targetId="e9e6-66cc-623f-8e94" type="rule"/>
+                <infoLink id="512f-5b34-9149-cc82" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
                 <infoLink id="63ba-0915-ad7c-54c2" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+                <infoLink id="5887-9bf7-6121-7c32" name="Impact Hits (D6)" hidden="false" targetId="e9e6-66cc-623f-8e94" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="8414-d88b-2341-d5a4" name="Bull Centaur" hidden="false" collective="false" import="true" type="upgrade">
@@ -5295,6 +5311,18 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="fbed-4c9e-3501-63dd" name="Light Armour" 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="d94c-a958-3081-1f7c" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="62e4-2100-1766-4c21" type="min"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="4b85-48db-fd7b-be0d" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -5318,7 +5346,7 @@ If the attack is successful, then D6 automatic hits are inflicted on the target.
                     <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
                     <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
                     <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-                    <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 4+)</characteristic>
+                    <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 6+)</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -5331,6 +5359,7 @@ Due to its constraints when pushing the Tenderizer forward, the Bull Centaur may
               <infoLinks>
                 <infoLink id="fa0f-8e4c-1f8e-6e45" name="Impact Hits (D6)" hidden="false" targetId="e9e6-66cc-623f-8e94" type="rule"/>
                 <infoLink id="22a1-b28f-5a9c-4690" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+                <infoLink id="233a-9808-70da-0211" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="fd52-3e45-51f0-818a" name="Bull Centaur" hidden="false" collective="false" import="true" type="upgrade">
@@ -5355,6 +5384,18 @@ Due to its constraints when pushing the Tenderizer forward, the Bull Centaur may
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="ef80-ad0c-1f2d-0da4" name="Light Armour" 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="725c-c913-54a2-b0a3" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cc51-43cc-b69c-6f7d" type="min"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="239c-a90e-739b-68cc" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -5385,7 +5426,7 @@ Due to its constraints when pushing the Tenderizer forward, the Bull Centaur may
             <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
             <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
             <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 3+)</characteristic>
+            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 4+)</characteristic>
           </characteristics>
         </profile>
       </profiles>
@@ -5430,6 +5471,18 @@ In each round of close combat after the first, the Iron Daemon may make a Stomp
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="72ec-0582-b888-9249" 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="5217-270b-7f8b-beae" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="459b-db6f-d7ed-7952" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="ce88-aab9-1b9a-fb40" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -5888,13 +5941,28 @@ The Black Powder Misfire chart is used when the weapon misfires, but all rolls o
         <categoryLink id="253e-dc01-2ce2-95cc" name="New CategoryLink" hidden="false" targetId="0eb4-f376-7725-b05b" primary="true"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="9045-d050-fe02-8355" name="Chaos Dwarf Crew" hidden="false" collective="false" import="true" type="model">
+        <selectionEntry id="9045-d050-fe02-8355" name="Chaos Dwarf Handler" hidden="false" collective="false" import="true" type="model">
           <constraints>
             <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="44c3-018c-0c76-ddf3" type="min"/>
             <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fb53-675f-ffde-13a9" type="max"/>
           </constraints>
+          <profiles>
+            <profile id="eeaf-1cbc-8f03-a11d" name="Chaos Dwarf Handler" publicationId="faf5-2026-3cea-6e96" page="74" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+              <characteristics>
+                <characteristic name="M" typeId="09ad-18df-607b-1215">3</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">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="LD" typeId="a199-f10b-a038-5730">9</characteristic>
+                <characteristic name="Type" typeId="13f9-a26b-05af-3459"/>
+              </characteristics>
+            </profile>
+          </profiles>
           <infoLinks>
-            <infoLink id="627c-c10a-4915-03d9" name="Chaos Dwarf Crew" hidden="false" targetId="e99d-da31-aec4-05e3" type="profile"/>
             <infoLink id="6efc-3290-01d8-1bf9" name="Contempt" hidden="false" targetId="c72b-b137-706f-ad14" type="rule"/>
             <infoLink id="e737-cb17-2316-a322" name="Resolute" hidden="false" targetId="983a-3e85-1855-a892" type="rule"/>
           </infoLinks>
@@ -5966,7 +6034,7 @@ The Black Powder Misfire chart is used when the weapon misfires, but all rolls o
             <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
             <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
             <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 3+)</characteristic>
+            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour Save 6+)</characteristic>
           </characteristics>
         </profile>
         <profile id="31bc-8b99-c5e8-0c8f" name="Siege Cannons" publicationId="faf5-2026-3cea-6e96" page="79" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
@@ -6028,6 +6096,18 @@ The crew of the Juggernaut do not suffer penalties for moving and shooting. The
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="a990-2132-01a9-b0f7" name="Heavy 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="32b6-7780-fb9d-e9b2" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c82d-39bc-2a29-24af" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="df7f-c750-63a8-b8a6" name="Heavy Armour" hidden="false" targetId="8e15-bc32-b40c-bad3" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -6225,8 +6305,7 @@ The crew of the Juggernaut do not suffer penalties for moving and shooting. The
         </profile>
         <profile id="b426-0f4d-f2ab-5721" name="Result" publicationId="faf5-2026-3cea-6e96" page="83" hidden="false" typeId="2cbb-7339-02bf-ff55" typeName="Man-sized Things Chart">
           <characteristics>
-            <characteristic name="1" typeId="98e0-7331-0823-c4e0">Yell and Bawl: Neither the Giant nor models in base contact with it fight if they have not already done so this
-round. The Giant’s side automatically wins the combat by 2 points or more. If both sides have a Giant that Yells and Bawls, the combat is a draw.</characteristic>
+            <characteristic name="1" typeId="98e0-7331-0823-c4e0">Yell and Bawl: Neither the Giant nor models in contact with it actually fight if they have not already done so this round. The Giant automatically wins the combat by 2 points or more. This result has no effect against Animated Constructs.</characteristic>
             <characteristic name="2" typeId="a999-b8b7-4b8c-da30">Smash with Pick: The Giant chooses a single target model from the enemy unit that it is in base contact with. The target may attempt to avoid the blow by passing an I test. If the test is failed, the model suffers 2D3 wounds with Ignores Armour saves. If a double is rolled, the Giant cannot attack at all in the following round of the same combat.</characteristic>
             <characteristic name="3-4" typeId="b9e3-bb50-cf6d-cbc3">Flail and Crush: First test to see if the Giant falls over, with any wounds caused if they do counting towards the combat result. If the Giant remains on its feet, select a target unit in base contact. That unit sustains
 2D6 S 6 automatic hits.</characteristic>
@@ -6243,9 +6322,6 @@ If a double 1 is rolled, no damage is inflicted on the enemy unit. Instead the G
         <rule id="8e02-e300-4f91-627a" name="Siege Giant Attacks" publicationId="faf5-2026-3cea-6e96" page="83" hidden="false">
           <description>In order to determine what a Chaos Siege Giant does in each Close Combat phase, pick a unit in base-to-base contact with the Giant and roll a D6, applying the result shown on one of the tables. Which table you use depends on the size of the Giant’s victim. Use the Man-sized Things Chart when fighting Infantry, Cavalry, War Beasts or Swarms. Use the Big Things Chart when fighting Monsters, Monstrous Beasts, Monstrous Infantry, Monstrous Cavalry, Chariots, War Machines, and Shrines with Large Target.</description>
         </rule>
-        <rule id="a77f-ac07-ecd4-838d" name="Siege Armour" publicationId="faf5-2026-3cea-6e96" page="82" hidden="false">
-          <description>The Giant counts as having medium armour, which increases to 3+ against shooting attacks to its front.</description>
-        </rule>
         <rule id="eede-c1e1-286b-f6d2" name="Fall Over" publicationId="faf5-2026-3cea-6e96" page="83" hidden="false">
           <description>A Giant must test to see whether it falls over if any of the following apply:
 
@@ -6256,12 +6332,9 @@ If a double 1 is rolled, no damage is inflicted on the enemy unit. Instead the G
 
 To see if a Giant falls over roll a D6. On a roll of 1, the Giant falls over. A slain Giant falls over automatically.
 
-To determine in which direction the Giant falls, roll a scatter dice. Any unit within 4&quot; of the direction the Giant falls suffers 2D6 S 6 Hits that have Multiple Wounds (D3), distributed as from shooting, though no single model may suffer more than 1 Hit – any excess Hits are ignored. If the unit is in combat and the Giant has fallen over
-whilst attempting to use Flailf and Crush, wounds inflicted by a falling Giant count towards the combat
-result.
+To determine in which direction the Giant falls, roll a scatter dice. Any unit within 4&quot; of the direction the Giant falls suffers 2D6 S 6 Hits with Multiple Wounds (D3), distributed as hits from shooting, though no single model may suffer more than 1 Hit – any excess Hits are ignored. If the unit is in combat and the Giant has fallen over whilst attempting to Jump Up and Down, wounds inflicted by a falling Giant count towards the combat result.
 
-A Giant that falls over automatically suffers 1 wound. If the Giant is in combat then this wound counts
-towards combat resolution.
+A Giant that falls over automatically suffers 1 wound. If the Giant is in combat then this wound counts towards combat resolution.
 
 Once on the ground a Giant may get up in his following Movement phase, but may not move that turn. Whilst on the ground a Giant may not attack, but the enemy must still roll to score hits on him. If forced to flee whilst on the ground the Giant is slain. If the Giant gets the opportunity to pursue his foes whilst he&apos;s on the ground he stands up instead. A Giant may attack in close combat as usual on the turn he stands up.</description>
         </rule>
@@ -6304,6 +6377,24 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
             <cost name="pts" typeId="points" value="25.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="861a-3ffe-da6d-ed90" name="Siege Armour" 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="3204-b4c6-ac1c-db46" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f42e-6145-c173-9b83" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="955a-ffc5-c2e3-074a" name="Siege Armour" publicationId="faf5-2026-3cea-6e96" page="84" hidden="false" typeId="884c-d50e-eeb6-eda0" typeName="Armour">
+              <characteristics>
+                <characteristic name="Combat" typeId="168d-1cc2-66f3-e766">5+</characteristic>
+                <characteristic name="Missile" typeId="97ea-ecf7-8d24-b2ca">4+</characteristic>
+                <characteristic name="Special Rules" typeId="ff58-91e4-84d7-e6e4"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="0.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
       <costs>
         <cost name="pts" typeId="points" value="215.0"/>
@@ -6415,7 +6506,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
                 </rule>
               </rules>
               <costs>
-                <cost name="pts" typeId="points" value="15.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="cd59-78d9-ef0a-3423" name="Brazen Wings" hidden="false" collective="false" import="true" type="upgrade">
@@ -6699,7 +6790,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
       <description>Units with this rule treat units without it as Expendable.</description>
     </rule>
     <rule id="983a-3e85-1855-a892" name="Resolute" publicationId="faf5-2026-3cea-6e96" page="52" hidden="false">
-      <description>Models with this rule roll 3D6 for any Break tests taken in the first round of combat, and discard the highest dice.</description>
+      <description>When taking Break tests, models with this rule count as having lost the combat with 1 point less than they actually have.</description>
     </rule>
     <rule id="d33a-2df6-1429-f2dc" name="Relentless" publicationId="faf5-2026-3cea-6e96" page="52" hidden="false">
       <description>Units entirely composed of models with this rule do not need to pass a Leadership test in order to march, regardless of the proximity of enemy units.</description>
@@ -6751,6 +6842,12 @@ One war machine that is within 3&quot; of an Infernal Engineer can re-roll one a
     <rule id="53c1-2384-a292-fecc" name="Daemonic" publicationId="faf5-2026-3cea-6e96" page="52" hidden="false">
       <description>Models with this rule have Magical Attacks, Unstable and Ward Save (5+).</description>
     </rule>
+    <rule id="634d-8f29-d7a7-277b" name="Hobgoblin Overseer" publicationId="faf5-2026-3cea-6e96" page="67" hidden="false">
+      <description>The Hobgoblin Overseer follows the rules for normal unit Champions; with the following exceptions: the Overseer is always placed in the rear rank of the unit, and may be the only model in that rank. In addition, the unit must take a LD test at the start of each of their turns. If failed, the Slaves are refusing to follow the Overseer&apos;s orders, and the unit will suffer D6 S 3 Hits.</description>
+    </rule>
+    <rule id="d16c-5317-eb1a-3c54" name="Palanquin" publicationId="faf5-2026-3cea-6e96" page="54" hidden="false">
+      <description>A Palanquin should be placed on a 40x40mm base and adds +4 to the Unit Strength of any model mounted on them.</description>
+    </rule>
   </sharedRules>
   <sharedProfiles>
     <profile id="Result (Animosity Chart)" name="Result" publicationId="faf5-2026-3cea-6e96" page="52" hidden="false" typeId="fd1a-59bd-75a6-4a0c" typeName="Animosity Chart">
@@ -6883,7 +6980,7 @@ One war machine that is within 3&quot; of an Infernal Engineer can re-roll one a
         <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">War Beast</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Cavalry</characteristic>
       </characteristics>
     </profile>
     <profile id="e99d-da31-aec4-05e3" name="Chaos Dwarf Crew" publicationId="faf5-2026-3cea-6e96" page="74" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
diff --git a/Cult_of_Ulric.cat b/Cult_of_Ulric.cat
index 3a8b2b7..945ee79 100644
--- a/Cult_of_Ulric.cat
+++ b/Cult_of_Ulric.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="0542-5575-8060-2eff" name="Cult of Ulric" revision="4" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="0542-5575-8060-2eff" name="Cult of Ulric" revision="5" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="dc49-a383-6108-ad49" name="Talisman of Ulric">
       <characteristicTypes>
@@ -1254,7 +1254,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1293,7 +1294,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1988,7 +1990,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2027,7 +2030,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Daemons_of_Chaos.cat b/Daemons_of_Chaos.cat
index cdd2373..1f30844 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="4" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="4" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="452f-70ac-20f9-baed" name="Daemons of Chaos" revision="5" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="324d-b81e-296a-d5cd" name="Reign of Chaos Table">
       <characteristicTypes>
@@ -72,8 +72,9 @@
       </rules>
       <infoLinks>
         <infoLink id="e960-210d-76f4-417b" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
-        <infoLink id="8624-3b1d-d697-d2fa" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
+        <infoLink id="8624-3b1d-d697-d2fa" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
         <infoLink id="c375-11a2-cc26-6a8d" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
+        <infoLink id="ebba-7dee-50b5-3536" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="d62c-499e-b006-a802" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -91,7 +92,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -366,7 +368,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -520,7 +523,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -784,7 +788,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -816,7 +821,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -848,7 +854,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -944,7 +951,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -976,7 +984,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1008,7 +1017,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1040,7 +1050,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1189,7 +1200,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1221,7 +1233,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1253,7 +1266,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1285,7 +1299,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1422,7 +1437,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1454,7 +1470,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1577,6 +1594,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                 <infoLink id="7af8-59ff-9482-7868" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
                 <infoLink id="c116-ed75-74a2-8781" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="3819-3d83-6862-ab23" name="Daemon of Tzeentch" hidden="false" targetId="f763-a8b8-ef54-e22c" type="rule"/>
+                <infoLink id="d9f4-5773-7649-1d48" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="b1ba-1788-c5a9-91db" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -1632,7 +1650,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                         <infoLink id="0e9d-39e8-36ad-2945" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="8.0"/>
+                        <cost name="pts" typeId="points" value="10.0"/>
                       </costs>
                     </selectionEntry>
                     <selectionEntry id="1d78-4a22-71f4-fba6" name="Light Armour" hidden="false" collective="false" import="true" type="upgrade">
@@ -1643,7 +1661,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                         <infoLink id="d53d-2e6c-05e3-f4bc" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="4.0"/>
+                        <cost name="pts" typeId="points" value="5.0"/>
                       </costs>
                     </selectionEntry>
                   </selectionEntries>
@@ -1761,6 +1779,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                 <infoLink id="9422-937d-2dbb-5f2f" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
                 <infoLink id="f2c8-34a5-b848-17bd" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="e7d3-bacf-c664-4d1d" name="Daemon of Slaanesh" hidden="false" targetId="4f49-9bdd-696d-bc2d" type="rule"/>
+                <infoLink id="2a3f-46d6-c5f9-4643" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="8c99-4059-914a-5e7f" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -1815,7 +1834,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                         <infoLink id="46f0-f166-c663-436b" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="8.0"/>
+                        <cost name="pts" typeId="points" value="10.0"/>
                       </costs>
                     </selectionEntry>
                     <selectionEntry id="e742-7e95-c38c-1ce1" name="Light Armour" hidden="false" collective="false" import="true" type="upgrade">
@@ -1826,7 +1845,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                         <infoLink id="b34c-64fa-ca45-e23a" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="4.0"/>
+                        <cost name="pts" typeId="points" value="5.0"/>
                       </costs>
                     </selectionEntry>
                   </selectionEntries>
@@ -1944,6 +1963,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                 <infoLink id="4719-21b3-f1e9-e594" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
                 <infoLink id="ee3d-6c24-8099-dee7" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="4149-2486-3762-0f57" name="Daemon of Nurgle" hidden="false" targetId="daf5-f973-a7d7-101e" type="rule"/>
+                <infoLink id="dcd9-5a64-3849-e404" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="6251-1ba3-0baa-c1ac" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -1998,7 +2018,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                         <infoLink id="27ea-c46b-5300-c173" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="8.0"/>
+                        <cost name="pts" typeId="points" value="10.0"/>
                       </costs>
                     </selectionEntry>
                     <selectionEntry id="9eb9-e090-2f31-ec0d" name="Light Armour" hidden="false" collective="false" import="true" type="upgrade">
@@ -2009,7 +2029,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                         <infoLink id="8b58-b9f3-52e9-049e" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="4.0"/>
+                        <cost name="pts" typeId="points" value="5.0"/>
                       </costs>
                     </selectionEntry>
                   </selectionEntries>
@@ -2126,6 +2146,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                 <infoLink id="c7e6-ae7d-a0e1-495f" name="Daemon Prince" hidden="false" targetId="32b9-15e6-4425-2d73" type="profile"/>
                 <infoLink id="5686-2e5c-d9ab-8d52" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
                 <infoLink id="c505-d5ad-e2cb-afda" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+                <infoLink id="aa48-d47d-2388-4ebb" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="1c98-3133-10f8-56eb" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -2319,6 +2340,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                 <infoLink id="5526-4110-3280-71bb" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
                 <infoLink id="cdfe-3094-8f5c-4bc5" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="aed9-7fae-8b9a-6c54" name="Daemon of Khorne" hidden="false" targetId="964e-697b-ab75-a66b" type="rule"/>
+                <infoLink id="f7cb-b152-1ceb-9f8c" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="3ff9-5d08-6970-c547" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -2374,7 +2396,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                         <infoLink id="8635-141b-af1a-e2e6" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="8.0"/>
+                        <cost name="pts" typeId="points" value="10.0"/>
                       </costs>
                     </selectionEntry>
                     <selectionEntry id="c99e-7b93-e665-af87" name="Light Armour" hidden="false" collective="false" import="true" type="upgrade">
@@ -2385,7 +2407,7 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                         <infoLink id="6183-91fa-f377-96b2" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="4.0"/>
+                        <cost name="pts" typeId="points" value="5.0"/>
                       </costs>
                     </selectionEntry>
                   </selectionEntries>
@@ -2750,7 +2772,8 @@ template suffering a S 3 hit with Magical Attacks.</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -3131,7 +3154,8 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3163,7 +3187,8 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3414,7 +3439,8 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -3747,7 +3773,8 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -3884,6 +3911,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                         <infoLink id="8e36-0059-642f-e5ad" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="9271-1a1f-8cd6-896f" name="Poisoned Attacks" hidden="false" targetId="fefd-9cb0-d6fa-e2ef" type="rule"/>
                         <infoLink id="13c7-c4ea-567d-376d" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
+                        <infoLink id="4a64-ac08-81db-f249" name="Strider (Marsh)" hidden="false" targetId="686b-8e1b-4d01-05ba" type="rule"/>
                       </infoLinks>
                       <costs>
                         <cost name="pts" typeId="points" value="35.0"/>
@@ -4318,7 +4346,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <infoLink id="add1-d2e5-498b-af31" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="b67e-4e28-0c80-ab2d" name="Bloodreaper" hidden="false" collective="false" import="true" type="upgrade">
@@ -4439,7 +4467,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <infoLink id="a23b-ef0f-02c3-0e16" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="8f16-b673-ac17-1b62" name="Plagueridden" hidden="false" collective="false" import="true" type="upgrade">
@@ -4531,7 +4559,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <infoLink id="c656-7ed7-c9de-29f1" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="d500-4650-f622-a27f" name="Alluress" hidden="false" collective="false" import="true" type="upgrade">
@@ -4606,7 +4634,8 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -4665,7 +4694,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <infoLink id="2c66-5a18-d072-cc49" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="1834-c6df-157a-92d1" name="Iridescent Horror" hidden="false" collective="false" import="true" type="upgrade">
@@ -4892,13 +4921,14 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
           </constraints>
           <infoLinks>
             <infoLink id="625a-cada-8223-cd28" name="Poisoned Attacks" hidden="false" targetId="fefd-9cb0-d6fa-e2ef" type="rule"/>
-            <infoLink id="b33e-aa77-bb6c-f83a" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
+            <infoLink id="b33e-aa77-bb6c-f83a" name="Strider (Marsh)" hidden="false" targetId="686b-8e1b-4d01-05ba" type="rule"/>
             <infoLink id="ef99-0a64-d8a0-4b53" name="Daemon of Nurgle" hidden="false" targetId="daf5-f973-a7d7-101e" type="rule"/>
             <infoLink id="7bb2-917b-e283-a2c2" name="Plague Toad" hidden="false" targetId="1daf-8b5c-ba7b-773a" type="profile"/>
             <infoLink id="25ac-f7f0-cf59-fed0" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+            <infoLink id="5ce8-8a1c-8099-bed0" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
           </infoLinks>
           <costs>
-            <cost name="pts" typeId="points" value="29.0"/>
+            <cost name="pts" typeId="points" value="31.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4999,7 +5029,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <infoLink id="9818-5a2a-ad7c-f9c0" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="34cc-b277-bea1-a361" name="Heartseeker" hidden="false" collective="false" import="true" type="upgrade">
@@ -5167,7 +5197,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <infoLink id="4564-283c-4b59-70fc" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="2f58-2bd8-9e5a-769f" name="Bloodhunter" hidden="false" collective="false" import="true" type="upgrade">
@@ -5243,6 +5273,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <infoLink id="2cbb-e14b-ca22-71b0" name="Plague Toad" hidden="false" targetId="1daf-8b5c-ba7b-773a" type="profile"/>
                 <infoLink id="520b-733c-762b-7b0b" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="00b2-83bd-1b33-eb2c" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
+                <infoLink id="eea4-cff9-c7b6-8f96" name="Strider (Marsh)" hidden="false" targetId="686b-8e1b-4d01-05ba" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
@@ -5250,7 +5281,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
             </selectionEntry>
           </selectionEntries>
           <costs>
-            <cost name="pts" typeId="points" value="35.0"/>
+            <cost name="pts" typeId="points" value="37.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -5290,7 +5321,7 @@ At the start of each of your turns, consult the Tally of Pestilence table to det
                 <infoLink id="f55f-2418-1ee6-e517" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="7d16-f0a7-a6e2-9334" name="Plagueleaper" hidden="false" collective="false" import="true" type="upgrade">
@@ -5881,7 +5912,7 @@ but it may not fire grapeshot.</characteristic>
                 <infoLink id="d3a3-ad2a-5e0f-d7ad" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="2af2-6b28-d461-ba3f" name="Plaguebringer" hidden="false" collective="false" import="true" type="upgrade">
@@ -6176,7 +6207,8 @@ but it may not fire grapeshot.</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -6222,7 +6254,7 @@ but it may not fire grapeshot.</characteristic>
             <characteristic name="I" typeId="7cca-e51f-edc2-7322">8</characteristic>
             <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">4</characteristic>
             <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>
-            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Monster (Special Character)</characteristic>
+            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Monstrous Infantry (Special Character)</characteristic>
           </characteristics>
         </profile>
         <profile id="be74-f116-ccf3-d3df" name="Esske" publicationId="ee54-3543-b9db-fe40" page="190" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -6248,7 +6280,7 @@ but it may not fire grapeshot.</characteristic>
           <description>All friendly Daemons of Slaanesh within 18&quot; of Syll&apos;Esske may re-roll 1&apos;s To Hit in close combat.</description>
         </rule>
         <rule id="5f57-7f3e-dbc4-5dfd" name="Deadly Symbiosis" publicationId="ee54-3543-b9db-fe40" page="190" hidden="false">
-          <description>Enemy characters who refuses a Challenge from Shalaxi Helbane suffer D3 S 5 Hits with no armour save allowed.</description>
+          <description>For each successful To Hit roll by Syll, Esske may reroll one failed To Hit roll the same phase.</description>
         </rule>
         <rule id="d001-16f3-af20-b0ef" name="Lithe and Swift" publicationId="ee54-3543-b9db-fe40" page="190" hidden="false">
           <description>Syll&apos;Esske may re-roll failed charge and pursuit rolls.</description>
@@ -6258,6 +6290,7 @@ but it may not fire grapeshot.</characteristic>
         <infoLink id="304f-62a8-7e6d-8e5c" name="Daemon of Slaanesh" hidden="false" targetId="4f49-9bdd-696d-bc2d" type="rule"/>
         <infoLink id="12d8-31ed-255d-f5d8" name="Daemonic" hidden="false" targetId="38e3-04cc-8978-e3a4" type="rule"/>
         <infoLink id="e9eb-dc11-2f4c-c68f" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
+        <infoLink id="31cf-f25f-4dae-1032" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="3f37-cc01-07b8-f1c3" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -6655,7 +6688,7 @@ but it may not fire grapeshot.</characteristic>
           <profiles>
             <profile id="a074-58f0-dae1-5bd1" name="Soul Hunger" publicationId="ee54-3543-b9db-fe40" page="202" hidden="false" typeId="efb3-d0de-5567-f01a" typeName="Daemonic Gift">
               <characteristics>
-                <characteristic name="Special Rules" typeId="4627-cfbc-c37e-235a">The Daemon may re-roll failed rolls To Hit and To Wound in the first round of any combat.</characteristic>
+                <characteristic name="Special Rules" typeId="4627-cfbc-c37e-235a">The Daemon may re-roll failed rolls To Hit and To Wound in the first round of any combat. This has no effect against Animated Constructs.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -6851,6 +6884,9 @@ but it may not fire grapeshot.</characteristic>
           </costs>
         </selectionEntry>
       </selectionEntries>
+      <entryLinks>
+        <entryLink id="679b-7ed4-80f9-48fa" name="Magic Standards" hidden="false" collective="false" import="true" targetId="2613-24d7-a26e-eb37" type="selectionEntryGroup"/>
+      </entryLinks>
     </selectionEntryGroup>
     <selectionEntryGroup id="aa64-641b-679d-4ec7" name="Magic Weapons" hidden="false" collective="false" import="true">
       <constraints>
@@ -7269,7 +7305,7 @@ but it may not fire grapeshot.</characteristic>
           <profiles>
             <profile id="75b5-6c20-a856-0af0" name="Spirit Swallower" publicationId="ee54-3543-b9db-fe40" page="204" hidden="false" typeId="efb3-d0de-5567-f01a" typeName="Daemonic Gift">
               <characteristics>
-                <characteristic name="Special Rules" typeId="4627-cfbc-c37e-235a">Roll a D6 for each unsaved wound the Daemon causes in close combat. On a 4+, the Daemon regains one wound lost earlier in the battle.</characteristic>
+                <characteristic name="Special Rules" typeId="4627-cfbc-c37e-235a">Roll a D6 for each unsaved wound the Daemon causes in close combat. On a 4+, the Daemon regains one wound lost earlier in the battle. This has no effect against Animated Constructs.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -7386,7 +7422,7 @@ but it may not fire grapeshot.</characteristic>
             </profile>
           </profiles>
           <costs>
-            <cost name="pts" typeId="points" value="25.0"/>
+            <cost name="pts" typeId="points" value="20.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="7e0d-30a0-4b39-367c" name="Master of Sorcery" page="" hidden="false" collective="false" import="true" type="upgrade">
@@ -7609,7 +7645,8 @@ They treat Daemons of Tzeentch and Nurgle as Suspicious Allies, and Daemons of K
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
       </characteristics>
     </profile>
     <profile id="Daemon Prince 2" name="Daemon Prince" publicationId="ee54-3543-b9db-fe40" page="193" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -7617,7 +7654,8 @@ They treat Daemons of Tzeentch and Nurgle as Suspicious Allies, and Daemons of K
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
       </characteristics>
     </profile>
     <profile id="Daemon Prince 3" name="Daemon Prince" publicationId="ee54-3543-b9db-fe40" page="193" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -7625,7 +7663,8 @@ They treat Daemons of Tzeentch and Nurgle as Suspicious Allies, and Daemons of K
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
       </characteristics>
     </profile>
     <profile id="Daemon Prince 4" name="Daemon Prince" publicationId="ee54-3543-b9db-fe40" page="193" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -7633,7 +7672,8 @@ They treat Daemons of Tzeentch and Nurgle as Suspicious Allies, and Daemons of K
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
       </characteristics>
     </profile>
     <profile id="e65b-7187-5379-584f" name="Blood Throne" publicationId="ee54-3543-b9db-fe40" page="131" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -7767,7 +7807,7 @@ They treat Daemons of Tzeentch and Nurgle as Suspicious Allies, and Daemons of K
         <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
         <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
         <characteristic name="I" typeId="7cca-e51f-edc2-7322">1</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">7</characteristic>
         <characteristic name="Type" typeId="13f9-a26b-05af-3459">Monstrous Beast</characteristic>
       </characteristics>
diff --git a/Dark_Elves.cat b/Dark_Elves.cat
index 579e671..cf6ed6f 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="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="1194-2922-b8ab-2f1d" name="Dark Elves" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="4d67-b1d7-6891-ce0e" name="Gift of Khaine">
       <characteristicTypes>
@@ -155,7 +155,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -360,7 +361,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -418,7 +420,7 @@
         <entryLink id="e567-5671-5267-0aeb" name="General" hidden="false" collective="false" import="true" targetId="d322-3c7a-6d1e-7dc2" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="375.0"/>
+        <cost name="pts" typeId="points" value="355.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="969d-95b8-7567-24fe" name="Malus Darkblade" hidden="false" collective="false" import="true" type="model">
@@ -586,7 +588,7 @@
             <characteristic name="I" typeId="7cca-e51f-edc2-7322">9</characteristic>
             <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">4</characteristic>
             <characteristic name="LD" typeId="a199-f10b-a038-5730">10</characteristic>
-            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Infantry (Special Character)</characteristic>
+            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Infantry (Special Character, Hag Queen)</characteristic>
           </characteristics>
         </profile>
       </profiles>
@@ -938,6 +940,18 @@
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="fa2e-0ece-14fc-aa79" name="Heavy Armour" 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="8d5a-6a4d-a424-6c52" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c39f-3ef7-e569-c8c3" type="min"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="0100-2a2e-0b71-d476" name="Heavy Armour" hidden="false" targetId="8e15-bc32-b40c-bad3" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -992,7 +1006,7 @@
                 <infoLink id="4bea-898f-0e75-a0ae" name="Dark Pegasus" hidden="false" targetId="2775-9321-c358-1756" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="50.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="044f-3175-ae8b-a01f" name="Dark Steed" hidden="false" collective="false" import="true" type="model">
@@ -1240,7 +1254,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1278,7 +1293,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1372,7 +1388,7 @@
                 <infoLink id="d3f5-28fa-4b8a-1de9" name="Dark Pegasus" hidden="false" targetId="2775-9321-c358-1756" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="50.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="07c6-8b5c-0cad-b5b2" name="Dark Steed" hidden="false" collective="false" import="true" type="model">
@@ -2384,6 +2400,18 @@
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="77b0-f79a-8313-f864" name="Heavy Armour" 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="c1ed-ed07-ae07-bd93" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="df92-79fa-41bd-320e" type="min"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="20fd-08ad-eeee-21ed" name="Heavy Armour" hidden="false" targetId="8e15-bc32-b40c-bad3" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -2420,7 +2448,7 @@
                 <infoLink id="4440-4461-713b-1a9e" name="Dark Pegasus" hidden="false" targetId="2775-9321-c358-1756" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="50.0"/>
+                <cost name="pts" typeId="points" value="20.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="c4eb-413d-8546-730b" name="Dark Steed" hidden="false" collective="false" import="true" type="model">
@@ -2713,7 +2741,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2751,7 +2780,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2827,7 +2857,7 @@
                 <infoLink id="d824-7b7d-ea83-0ee9" name="Dark Pegasus" hidden="false" targetId="2775-9321-c358-1756" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="50.0"/>
+                <cost name="pts" typeId="points" value="20.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="c6ae-c12a-d458-843f" name="Dark Steed" hidden="false" collective="false" import="true" type="model">
@@ -2990,6 +3020,18 @@
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="61f9-ba63-2ebe-0e24" name="Sea Dragon Cloak" 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="0d30-0e56-629c-b0d5" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cb4a-1226-8b4d-abd3" type="min"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="e13c-828a-f6f9-bbfa" name="Sea Dragon Cloak" hidden="false" targetId="ce36-359a-77b4-506d" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -3022,7 +3064,7 @@
                 </selectionEntry>
               </selectionEntries>
               <costs>
-                <cost name="pts" typeId="points" value="90.0"/>
+                <cost name="pts" typeId="points" value="80.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4408,7 +4450,7 @@ For each unsaved Wound caused by Disciple in close combat, he gains +1 to cast i
                 <infoLink id="7cbc-f646-72d0-2325" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="b7bb-338e-ec1a-a620" name="Herald" hidden="false" collective="false" import="true" type="upgrade">
@@ -5367,6 +5409,18 @@ 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="2ba5-3cd1-8a83-aa5b" name="Heavy 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="e12d-f7ca-d039-8e20" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fe71-bbe0-1e94-d5df" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="3d85-a083-af19-ac5e" name="Heavy Armour" hidden="false" targetId="8e15-bc32-b40c-bad3" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -5440,6 +5494,18 @@ 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="75e4-d00a-1477-40aa" name="Sea Dragon Cloak" 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="f874-be33-b641-27bb" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="88a3-e18a-acf9-d265" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="57c1-8131-1be9-bd29" name="Sea Dragon Cloak" hidden="false" targetId="ce36-359a-77b4-506d" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -5472,7 +5538,7 @@ For each unsaved Wound caused by Disciple in close combat, he gains +1 to cast i
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="90.0"/>
+        <cost name="pts" typeId="points" value="80.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e3a4-9651-d4a5-95da" name="Shades" hidden="false" collective="false" import="true" type="unit">
@@ -6230,15 +6296,16 @@ For each unsaved Wound caused by Disciple in close combat, he gains +1 to cast i
                 <profile id="e6d1-1fd0-ae43-59e8" name="Doomfire Warlock" publicationId="9e23-79cb-pubN76150" page="134" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e"/>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e"/>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
               <rules>
                 <rule id="8ac3-24f2-95f1-2509" name="Cursed Coven" publicationId="9e23-79cb-pubN76150" page="134" hidden="false">
-                  <description>A unit of Doomfire Warlocks is considered to be a Level 2 Wizard that knows the spells Soulblight and Doombolt. This doesn&apos;t stop other Wizards from knowing those same spells. The unit receives an additional +1 to cast for each rank of 4 or more models in the unit, after the first, to a maximum of +3. Each time the unit casts a spell, you must nominate one Master of Warlocks or Doomfire Warlock as the caster for the purposes of line of sight, range, etc. In the event that a Doomfire Warlock unit rolls a miscast, do not roll on the Miscast table. Instead, the unit suffers D3 Wounds with no armour saves allowed. If the unit is targeted by a rule that affects a Wizard, your opponent must choose one Master of Warlocks or Doomfire Warlock as the target.</description>
+                  <description>A unit of Doomfire Warlocks is considered to be a Level 2 Wizard that knows the spells Soulblight and Doombolt. This doesn&apos;t stop other Wizards from knowing those same spells. The unit receives an additional +1 to cast for each rank of 5 or more models in the unit, after the first, to a maximum of +3. Each time the unit casts a spell, you must nominate one Master of Warlocks or Doomfire Warlock as the caster for the purposes of line of sight, range, etc. In the event that a Doomfire Warlock unit rolls a miscast, do not roll on the Miscast table. Instead, the unit suffers D3 Wounds with no armour saves allowed. If the unit is targeted by a rule that affects a Wizard, your opponent must choose one Master of Warlocks or Doomfire Warlock as the target.</description>
                 </rule>
               </rules>
               <infoLinks>
@@ -7156,7 +7223,7 @@ For each unsaved Wound caused by Disciple in close combat, he gains +1 to cast i
           <profiles>
             <profile id="2824-f6bc-15e7-1884" name="Cloak of Twilight" publicationId="9e23-79cb-pubN76150" page="171" hidden="false" typeId="ff67-d27f-2eef-bb35" typeName="Enchanted Item">
               <characteristics>
-                <characteristic name="Special Rules" typeId="9d2e-d14d-dd58-a829">The wearer of the Cloak of Twilight has a Ward save (3+) against Wounds caused by shooting attacks and spells.</characteristic>
+                <characteristic name="Special Rules" typeId="9d2e-d14d-dd58-a829">The wearer of the Cloak of Twilight has a Ward save (3+) against Wounds caused by enemy shooting attacks and spells.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -7387,7 +7454,7 @@ following Close Combat phase.</characteristic>
       <description>At the start of each Close Combat phase, before challenges are issued, enemy models in base contact with this model must pass an I test or suffer a S 4 hit with Killing Blow and no armour saves allowed. This is a magical attack.</description>
     </rule>
     <rule id="5fbf-c37d-f1be-dcc2" name="Impale" publicationId="9e23-79cb-pubN76150" page="148" hidden="false">
-      <description>On a turn in which it charges, a Dark Pegasus gains Strength Bonus (1).</description>
+      <description>Dark Pegasi gain +1 S to their Impact Hits.</description>
     </rule>
     <rule id="15c3-e08b-0738-0239" name="Noxious Breath" publicationId="9e23-79cb-pubN76150" page="150" hidden="false">
       <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>
diff --git a/Dogs_of_War.cat b/Dogs_of_War.cat
index bcbc5bc..2720e0d 100644
--- a/Dogs_of_War.cat
+++ b/Dogs_of_War.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="64a1-690b-5a90-4de6" name="Dogs of War" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="64a1-690b-5a90-4de6" name="Dogs of War" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="35d0-e027-3d89-392c" name="Hobgoblin Animosity Chart">
       <characteristicTypes>
@@ -280,6 +280,9 @@
           <description>Any friendly Human unit within 8&quot; of Lucrezzia Rally automatically during your Compulsory Movement phase. This does not affect any troops that have Immunity (Psychology).</description>
         </rule>
       </rules>
+      <infoLinks>
+        <infoLink id="294c-e9e4-8d87-c810" name="The Best Money Can Buy" hidden="false" targetId="2c67-26d2-b08b-3286" type="rule"/>
+      </infoLinks>
       <categoryLinks>
         <categoryLink id="c506-eb34-5616-23c5" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
         <categoryLink id="2fa1-00a9-abce-57a5" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="false"/>
@@ -326,7 +329,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1039,7 +1043,7 @@
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="45.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1328,7 +1332,7 @@
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="45.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="9621-f9bf-8b18-ed0b" name="Griffon" hidden="false" collective="false" import="true" type="model">
@@ -1404,7 +1408,7 @@
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="125.0"/>
+                <cost name="pts" typeId="points" value="150.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1672,7 +1676,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1711,7 +1716,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1812,7 +1818,7 @@
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="45.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2033,7 +2039,7 @@ Dice, Scatter Dice, or To Hit roll per turn.
           <profiles>
             <profile id="fa27-754d-ec82-ed75" name="The Crest of Mydas" publicationId="8ada-88a0-cdcd-9b5e" page="80" hidden="false" typeId="065f-58ea-de5d-d3c6" typeName="Talisman">
               <characteristics>
-                <characteristic name="Special Rules" typeId="08ca-4a32-203d-40c0">The Crest of Mydas gives all models in Mydas’ unit Magical Attacks..</characteristic>
+                <characteristic name="Special Rules" typeId="08ca-4a32-203d-40c0">Mydas and all models in the same unit gains Magical Attacks. In addition, enemy models must re-roll successful Ward Saves caused by close combat attacks from the unit.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -2266,7 +2272,7 @@ Dice, Scatter Dice, or To Hit roll per turn.
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="45.0"/>
+                <cost name="pts" typeId="points" value="20.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2595,7 +2601,8 @@ Dice, Scatter Dice, or To Hit roll per turn.
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2634,7 +2641,8 @@ Dice, Scatter Dice, or To Hit roll per turn.
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -5451,7 +5459,7 @@ If the Paymaster is killed, all friendly units gain Hatred against the enemy uni
                   </constraints>
                   <rules>
                     <rule id="6d22-63a0-21b3-4aee" name="Net Fighters" publicationId="8ada-88a0-cdcd-9b5e" page="55" hidden="false">
-                      <description>At the start of each round of close combat, Pit Fighters armed with nets must attempt to entangle one of the units they are fighting. Roll a D6; on a 3+, the enemy unit has become entangled. A unit that has been entangled are reduced to WS 1 until the end of the combat round. This only affects models in base contact with the Pit Fighters themselves.</description>
+                      <description>When it is their turn to attack, roll a D6 for each model armed with nets. On a 2+, one enemy model in base contact is ensnared and suffers -1 Attack (both rider and mount) for the remainder of the close combat phase.</description>
                     </rule>
                   </rules>
                   <infoLinks>
@@ -7101,15 +7109,17 @@ If the Paymaster is killed, all friendly units gain Hatred against the enemy uni
         </profile>
         <profile id="ba20-1558-0f78-01be" name="Result" publicationId="8ada-88a0-cdcd-9b5e" page="68" hidden="false" typeId="283e-1abd-ce89-3ff0" typeName="Man-sized Things Chart">
           <characteristics>
-            <characteristic name="1" typeId="0d11-d165-d261-fb15">Yell and Bawl: Neither the Giant nor models in contact with it actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points (if both sides have a Giant that Yells and Bawls, the combat is a draw). This result has no effect against Animated Constructs.</characteristic>
-            <characteristic name="2" typeId="0047-83bd-8d24-159f">Jump Up and Down: The Giant jumps up and down on top of the enemy. Before he starts, the Giant must test to determine if he falls over. If he falls over, work out where he falls and calculate damage. Any wounds caused by the fall (on either side) count towards the combat result. If the Giant remains on his feet, the target unit sustains 2D6 S 6 hits. Work out damage and saves as usual. Giants enjoy jumping up and down on their enemies so much that a Giant that does so in one combat round will automatically do so in the following round if he is able to, assuming that he did not fall over in the previous round. A Giant that starts to Jump Up and Down will therefore continue to do so on the same target until he falls over, the target is destroyed, or the combat ends.</characteristic>
+            <characteristic name="1" typeId="0d11-d165-d261-fb15">Yell and Bawl: Neither the Giant nor models in contact with it actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points. This result has no effect against Animated Constructs.</characteristic>
+            <characteristic name="2" typeId="0047-83bd-8d24-159f">Jump Up and Down: The Giant jumps up and down on top of the enemy. Before he starts, the Giant must test to determine if he falls over. If he falls over, work out where he falls and calculate damage. Any wounds caused by the fall (on either side) count towards the combat result. If the Giant remains on its none-too-nimble feet, it will inflict two Stomp attacks.
+
+Giants enjoy jumping up and down on their enemies so much that a Giant that does so in one combat round will automatically do so in the following round if he is able to, assuming that he did not fall over in the previous round. A Giant that starts to Jump Up and Down will therefore continue to do so on the same target until he falls over, the target is destroyed, or the combat ends.</characteristic>
             <characteristic name="3" typeId="94bd-4607-fdd3-508d">Pick Up and...: The Giant stoops down and grabs a single Character in base contact from the target unit (Giant player&apos;s choice). If no character is present in base contact, roll again on the Man-sized Things until you get another result. The Giant grabs the model and the player rolls a D6 on the Pick Up and... table.</characteristic>
             <characteristic name="4-6" typeId="7ac4-c7a9-e904-3aae">Swing with club: The Giant fights using the Random Attacks (2D6) this round.</characteristic>
           </characteristics>
         </profile>
         <profile id="6622-7b5e-f2d3-6c1f" name="Result" publicationId="8ada-88a0-cdcd-9b5e" page="68" hidden="false" typeId="ae7e-88dc-c3b6-6123" typeName="Big Things Chart">
           <characteristics>
-            <characteristic name="1" typeId="98eb-8996-b542-8a2f">Yell and Bawl: Neither the Giant nor models in contact with it actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points (if both sides have a Giant that Yells and Bawls, the combat is a draw). This result has no effect against Animated Constructs.</characteristic>
+            <characteristic name="1" typeId="98eb-8996-b542-8a2f">Yell and Bawl: Neither the Giant nor models in contact with it actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points. This result has no effect against Animated Constructs.</characteristic>
             <characteristic name="2-4" typeId="9c78-a29c-fe9d-4acf">Thump with Club: The Giant brings down its club on a single model from the target unit that is in base contact. The target may attempt to avoid the blow by passing an I test (use the lowest if the model has several different values). If the test is failed, the model takes 2D3 wounds which Ignores Armour Saves. If a double is rolled the Giant&apos;s club embeds itself in the ground and the Giant cannot attack at all in the following round of the same combat whilst it recovers its weapon.</characteristic>
             <characteristic name="5-6" typeId="0ce0-28d1-b95d-8e0d">&apos;Eadbutt: The Giant head-butts a single enemy model from the target unit, automatically inflicting D3 wounds which Ignores Armour Saves. If the victim is wounded but not slain, then it is dazed and loses all of its following attacks. If the target has not yet attacked in that combat round, it loses those attacks; if it has already attacked, then it loses the next round&apos;s attacks.</characteristic>
           </characteristics>
@@ -7118,7 +7128,7 @@ If the Paymaster is killed, all friendly units gain Hatred against the enemy uni
           <characteristics>
             <characteristic name="1" typeId="17ef-47fd-4b1d-0b60">Stuff into Bag: The model is effectively removed as a casualty and can do nothing whilst in the bag, but if the Giant should be slain, any enemy trapped in its bag are freed at the end of the battle, and no longer counts as casualties.</characteristic>
             <characteristic name="2" typeId="ea5a-3d3e-b5b5-78b2">Throw Back into Combat: The victim suffers D3 S 6 Hits which Ignores Armour saves, and D6 S 3 hits are inflicted on the unit (save as normal).</characteristic>
-            <characteristic name="3" typeId="25f6-83ad-a001-9f93">Hurl: The victim is hurled into an enemy unit within 12&quot; of the Giant – randomly determine which. The victim suffers D3 S 6 Hits which Ignores Armour saves, and the unit takes D6 S 3 hits (save as normal). Unsaved Wounds from these hits count towards the Giant&apos;s combat result. If no enemy units are in range, treat this as a Throw Back into Combat result instead.</characteristic>
+            <characteristic name="3" typeId="25f6-83ad-a001-9f93">Hurl: The victim is hurled into an enemy unit within 12&quot; of the Giant – randomly determine which. The victim is removed as a casualty, and the unit takes D6 S 3 hits. Unsaved Wounds from these hits count towards the Giant&apos;s combat result. If no enemy units are in range, treat this as a Throw Back into Combat result instead.</characteristic>
             <characteristic name="4" typeId="e5df-26c4-2220-5c3b">Squash: The model is removed as a casualty.</characteristic>
             <characteristic name="5" typeId="3d17-c4a7-742b-a542">Eat: The model is removed as a casualty.</characteristic>
             <characteristic name="6" typeId="af4b-564b-f053-7b98">Pick Another: Treat the attack as if the Giant had rolled the Stuff into Bag result, above, and then choose another victim. Roll again on this table to see what the Giant does with it.</characteristic>
@@ -8663,15 +8673,15 @@ I and a -1 penalty to Dangerous Terrain tests.</characteristic>
             <cost name="pts" typeId="points" value="45.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="f33e-5879-a36f-d175" name="Standard of Miragliano" page="" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="f33e-5879-a36f-d175" name="Eagle Banner" page="" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="8ed3-2b66-33fb-9355" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ccef-fcff-aed1-2199" type="max"/>
           </constraints>
           <profiles>
-            <profile id="becf-bafa-ceee-4604" name="Standard of Miragliano" publicationId="8ada-88a0-cdcd-9b5e" page="87" hidden="false" typeId="fc80-e52f-edf4-4e7e" typeName="Magic Standard">
+            <profile id="becf-bafa-ceee-4604" name="Eagle Banner" publicationId="8ada-88a0-cdcd-9b5e" page="87" hidden="false" typeId="fc80-e52f-edf4-4e7e" typeName="Magic Standard">
               <characteristics>
-                <characteristic name="Special Rules" typeId="97aa-092b-c6fe-4f5a">A unit carrying this standard may re-roll any 1&apos;s To Hit with missile weapons and in close combat.</characteristic>
+                <characteristic name="Special Rules" typeId="97aa-092b-c6fe-4f5a">Enemies can never get the Outnumber, Flank or Rear combat resolution bonus against the unit carrying this banner.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -8997,7 +9007,7 @@ I and a -1 penalty to Dangerous Terrain tests.</characteristic>
       <description>If a Merchant Prince is included in your army, one Dogs of War unit (which is not a Regiment of Renown, character, monster or war machine) may increase its armour save by +1 or gain Armour Piercing (1). This costs +1 point per model for Infantry, and 2 points per model for other troop types. Alternatively, the unit may take a Magic Standard worth up to 50 points.</description>
     </rule>
     <rule id="dabf-011d-48c3-3ad8" name="Resolute" publicationId="8ada-88a0-cdcd-9b5e" page="56" hidden="false">
-      <description>Models with this rule roll 3D6 for any Break tests taken in the first round of combat, and discard the highest dice.</description>
+      <description>When taking Break tests, models with this rule count as having lost the combat with 1 point less than they actually have.</description>
     </rule>
     <rule id="3c9f-7efb-2171-88c0" name="Ogre Charge" publicationId="8ada-88a0-cdcd-9b5e" page="61" hidden="false">
       <description>Each model with Ogre Charge that successfully charges an enemy has Impact Hits (1). Models with this rule that are part of a unit with ranks add their current Rank Bonus to the S of the Impact Hits they inflict.</description>
@@ -9006,7 +9016,7 @@ I and a -1 penalty to Dangerous Terrain tests.</characteristic>
       <description>Units entirely composed of models with this rule do not need to pass a LD test in order to march, regardless of the proximity of enemy units.</description>
     </rule>
     <rule id="e62f-b679-cec3-40a2" name="Ancestral Grudge" publicationId="8ada-88a0-cdcd-9b5e" page="56" hidden="false">
-      <description>Dwarfs always have Hatred (Orcs &amp; Goblins) and Hatred (Skaven).</description>
+      <description>Dwarfs have Hatred (Orcs &amp; Goblins, Skaven, Hobgoblins).</description>
     </rule>
     <rule id="d214-7789-dea9-d76f" name="Short and Nimble" publicationId="8ada-88a0-cdcd-9b5e" page="59" hidden="false">
       <description>Enemies attacking models with this rule suffer -1 To Hit in close combat.</description>
diff --git a/Dwarfs.cat b/Dwarfs.cat
index 643d228..84a5dd7 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="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b378-d254-8745-ba60" name="Dwarfs" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="2bfd-fe7d-294c-9853" name="Rules of the Runes Table">
       <characteristicTypes>
@@ -155,6 +155,7 @@ increases the range of his Inspiring Presence rule to 18&quot;. If Thorgrim join
         <infoLink id="d06d-2486-038d-3232" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
         <infoLink id="9745-e8c0-a4a0-c7c5" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
         <infoLink id="1204-dab6-1876-165e" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
+        <infoLink id="b48e-9b35-de6c-6da3" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="64d5-3677-cebb-bb18" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -228,7 +229,7 @@ increases the range of his Inspiring Presence rule to 18&quot;. If Thorgrim join
               <characteristics>
                 <characteristic name="Combat" typeId="617f-cb5d-6c83-2017"/>
                 <characteristic name="Missile" typeId="5b67-725f-ad85-da5b"/>
-                <characteristic name="Special Rules" typeId="4e25-3626-a136-c38d">Gromril heavy armour. The Armour of Skaldour is inscribed with the Master Rune of Skaldour which gives him a Ward save (4+), a Rune of Preservation and a Rune of Stone.</characteristic>
+                <characteristic name="Special Rules" typeId="4e25-3626-a136-c38d">Heavy armour. The Armour of Skaldour is inscribed with the Master Rune of Skaldour which gives him a Ward save (4+), a Rune of Preservation and a Rune of Stone.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -353,6 +354,7 @@ increases the range of his Inspiring Presence rule to 18&quot;. If Thorgrim join
           <infoLinks>
             <infoLink id="3d73-a07d-8f27-9872" name="Anvil of Doom" hidden="false" targetId="17c3-44e8-eb49-193b" type="rule"/>
             <infoLink id="c50d-5131-d04a-f8a1" name="Locus of Power" hidden="false" targetId="b8e0-2cfd-0dae-8e2a" type="rule"/>
+            <infoLink id="4cb9-519a-5b10-f721" name="Anvil of Doom" hidden="false" targetId="6859-c610-8917-4444" type="profile"/>
           </infoLinks>
           <selectionEntries>
             <selectionEntry id="6023-907e-f5df-0859" name="Kraggi" hidden="false" collective="false" import="true" type="model">
@@ -435,20 +437,39 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
               <infoLinks>
                 <infoLink id="3b53-8388-e302-49a5" name="Anvil Guards" hidden="false" targetId="d5ac-7845-cb67-f1f1" type="profile"/>
               </infoLinks>
-              <selectionEntries>
-                <selectionEntry id="3e37-fa50-51dc-3010" name="Hand Weapon" hidden="false" collective="true" import="true" type="upgrade">
+              <selectionEntryGroups>
+                <selectionEntryGroup id="086c-aedf-5212-4e23" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="57df-adeb-02f4-85d4">
                   <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2b45-7e75-9b1c-1c7c" type="max"/>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f8aa-9819-a372-c210" type="min"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8d50-4042-b12d-e189" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3b92-2032-d00d-e7af" type="min"/>
                   </constraints>
-                  <infoLinks>
-                    <infoLink id="9066-64ed-5090-162f" 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>
+                  <selectionEntries>
+                    <selectionEntry id="57df-adeb-02f4-85d4" name="Hand Weapon &amp; 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="0edd-52b6-ed06-35c0" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="546e-fd6b-cd99-2e90" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
+                        <infoLink id="37e8-532c-992e-1c7c" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="eb09-9cd2-84e6-f526" 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="da4d-f2e5-f256-90e5" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="2d78-fb3a-fbf4-0bac" name="Great Weapon" hidden="false" targetId="193e-bc43-b252-8eff" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="1.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
@@ -463,7 +484,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
         <entryLink id="46e2-7afc-d5fd-5a38" name="General" hidden="false" collective="false" import="true" targetId="d322-3c7a-6d1e-7dc2" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="350.0"/>
+        <cost name="pts" typeId="points" value="330.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="763f-fc3b-b5f1-e13b" name="Belegar Ironhammer" hidden="false" collective="false" import="true" type="model">
@@ -496,6 +517,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
         <infoLink id="1fc4-9277-da70-dbd4" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
         <infoLink id="bff5-6f0b-6dd6-2645" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
         <infoLink id="e2c1-0cdd-da50-fc78" name="Stubborn" hidden="false" targetId="d56e-8ec7-dbcd-aeee" type="rule"/>
+        <infoLink id="ff18-bb56-9f47-9c36" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="77b7-e92a-2127-83b1" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -554,13 +576,13 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="d042-2c2b-5dc6-9293" name="Gromril Full Plate Armour" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="d042-2c2b-5dc6-9293" name="Full Plate Armour" 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="5117-4ef7-efdd-b9aa" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9445-f0f3-75b5-67ae" type="max"/>
           </constraints>
           <infoLinks>
-            <infoLink id="523d-caae-43c9-efeb" name="Gromril Full Plate Armour" hidden="false" targetId="7eb8-a680-5bd0-3e2a" type="profile"/>
+            <infoLink id="523d-caae-43c9-efeb" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -598,6 +620,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
         <infoLink id="7f50-ec22-8b60-7b9b" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
         <infoLink id="e1c3-0f13-0098-d6c8" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
         <infoLink id="1d93-de48-bbff-3502" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
+        <infoLink id="1c24-bf5b-eab2-5022" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="c428-f847-d9cb-67eb" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -614,7 +637,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
               <characteristics>
                 <characteristic name="Combat" typeId="617f-cb5d-6c83-2017"/>
                 <characteristic name="Missile" typeId="5b67-725f-ad85-da5b"/>
-                <characteristic name="Special Rules" typeId="4e25-3626-a136-c38d">Gromril medium armour. The Armour of the King of Karak Azul is inscribed with one Rune of Fortitude and a Rune of Resistance.</characteristic>
+                <characteristic name="Special Rules" typeId="4e25-3626-a136-c38d">Medium armour. The Armour of the King of Karak Azul is inscribed with one Rune of Fortitude and a Rune of Resistance.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -720,6 +743,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
         <infoLink id="1aca-d0d1-454c-6db1" name="Daemon Slayer" hidden="false" targetId="96e9-1cf9-efcf-5b46" type="rule"/>
         <infoLink id="f2ce-2e6a-4651-a4e4" name="Unbreakable" hidden="false" targetId="1c9d-2d99-6222-2853" type="rule"/>
         <infoLink id="60b7-8504-f0e3-6cf0" name="Deathblow" hidden="false" targetId="1707-3abf-d5c8-97c0" type="rule"/>
+        <infoLink id="c3aa-e487-7f02-501b" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="f2bd-abe2-f27f-aed4" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -746,13 +770,13 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="3918-2364-0175-095f" name="Gromril Medium Armour" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="3918-2364-0175-095f" name="Medium Armour" 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="828d-ac58-913f-cdb5" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c09a-0995-7e9c-00b7" type="max"/>
           </constraints>
           <infoLinks>
-            <infoLink id="e5e0-e790-b2fe-241d" name="Gromril Medium Armour" hidden="false" targetId="aa8c-8cb0-30f5-f6a3" type="profile"/>
+            <infoLink id="e5e0-e790-b2fe-241d" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -839,6 +863,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
         <infoLink id="ba44-784e-3e30-69b9" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
         <infoLink id="17c3-152e-4367-afba" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
         <infoLink id="b9d2-3b00-7495-ad74" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
+        <infoLink id="c130-9ac8-546d-6475" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="2a2e-0521-23e5-deb6" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -928,7 +953,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
               <characteristics>
                 <characteristic name="Combat" typeId="617f-cb5d-6c83-2017"/>
                 <characteristic name="Missile" typeId="5b67-725f-ad85-da5b"/>
-                <characteristic name="Special Rules" typeId="4e25-3626-a136-c38d">Gromril heavy armour. Hrappi-klad is inscribed with a Rune of Shielding.</characteristic>
+                <characteristic name="Special Rules" typeId="4e25-3626-a136-c38d">Heavy armour. Hrappi-klad is inscribed with a Rune of Shielding.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -987,6 +1012,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
         <infoLink id="214e-f9a9-896a-e30e" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
         <infoLink id="106a-5b13-0097-f4cf" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
         <infoLink id="801b-1599-ddf5-d195" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
+        <infoLink id="8f54-e51b-8642-efd3" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9cf7-e5b8-0acb-6af5" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -1025,7 +1051,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
               <characteristics>
                 <characteristic name="Combat" typeId="617f-cb5d-6c83-2017"/>
                 <characteristic name="Missile" typeId="5b67-725f-ad85-da5b"/>
-                <characteristic name="Special Rules" typeId="4e25-3626-a136-c38d">Gromril medium armour. Byrrmoth’s Armour is inscribed with two Runes of Warding.</characteristic>
+                <characteristic name="Special Rules" typeId="4e25-3626-a136-c38d">Medium armour. Byrrmoth’s Armour is inscribed with two Runes of Warding.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1188,6 +1214,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
         <infoLink id="b91f-d901-56be-91b3" name="Forgefire" hidden="false" targetId="bb72-6ff9-97d0-2b93" type="rule"/>
         <infoLink id="4f49-07eb-a826-ae2c" name="Runelore" hidden="false" targetId="ea4e-4c94-bec3-7f03" type="rule"/>
         <infoLink id="0002-733c-10b0-8958" name="Stubborn" hidden="false" targetId="d56e-8ec7-dbcd-aeee" type="rule"/>
+        <infoLink id="5d4b-1284-70f9-6772" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="7a18-e99e-957a-7815" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -1233,13 +1260,13 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="383b-785d-08ad-9f65" name="Gromril Medium Armour" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="383b-785d-08ad-9f65" name="Medium Armour" 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="48e8-eb2a-2253-c8c1" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="abce-a968-91af-6234" type="max"/>
           </constraints>
           <infoLinks>
-            <infoLink id="6afa-ec92-8a30-bc40" name="Gromril Medium Armour" hidden="false" targetId="aa8c-8cb0-30f5-f6a3" type="profile"/>
+            <infoLink id="4827-ca8e-5082-7509" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -1250,7 +1277,7 @@ Thorek can re-roll a single dice on a failed attempt to cast one of the innate b
         <entryLink id="982c-c184-aac2-65ff" name="General" hidden="false" collective="false" import="true" targetId="d322-3c7a-6d1e-7dc2" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="190.0"/>
+        <cost name="pts" typeId="points" value="175.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="84b7-fd43-ba2f-1296" name="Grombrindal" hidden="false" collective="false" import="true" type="model">
@@ -1384,8 +1411,9 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
       </profiles>
       <infoLinks>
         <infoLink id="e5ad-8806-f34c-eef5" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
-        <infoLink id="0e13-6ec4-8ada-8dab" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
+        <infoLink id="0e13-6ec4-8ada-8dab" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
         <infoLink id="e0a4-bb37-5a0f-6a1b" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
+        <infoLink id="a15a-18c5-3516-ea50" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="25a5-60e5-706d-feae" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -1459,34 +1487,34 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6af5-4cd1-8df6-d9e4" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="3125-ace8-64d1-6a41" name="Gromril Full Plate Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="3125-ace8-64d1-6a41" name="Full Plate Armour" 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="9c71-0076-8b73-4ec1" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="2e55-e35b-df6d-ad98" name="Gromril Full Plate Armour" hidden="false" targetId="7eb8-a680-5bd0-3e2a" type="profile"/>
+                <infoLink id="eb69-6581-8f72-f065" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="6.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="4720-f6a2-cb87-bef9" name="Gromril Heavy Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="4720-f6a2-cb87-bef9" name="Heavy Armour" 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="6535-1b3c-a25c-34fd" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="d838-a096-ae12-79a6" name="Gromril Heavy Armour" hidden="false" targetId="6633-a69d-b4c9-b92a" type="profile"/>
+                <infoLink id="d838-a096-ae12-79a6" name="Heavy Armour" hidden="false" targetId="8e15-bc32-b40c-bad3" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="3.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="1345-c8e6-3f49-cd93" name="Gromril Medium Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="1345-c8e6-3f49-cd93" name="Medium Armour" 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="28ea-b434-fee4-7537" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="1779-4595-804e-91d5" name="Gromril Medium Armour" hidden="false" targetId="aa8c-8cb0-30f5-f6a3" type="profile"/>
+                <infoLink id="0c94-5ee0-a342-2a69" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
@@ -1608,6 +1636,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
         <infoLink id="1308-53fb-cbd9-ee02" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
         <infoLink id="16f8-f883-b80c-9297" name="Runelore" hidden="false" targetId="ea4e-4c94-bec3-7f03" type="rule"/>
         <infoLink id="3d08-580d-2a7a-4de5" name="Forgefire" hidden="false" targetId="bb72-6ff9-97d0-2b93" type="rule"/>
+        <infoLink id="793c-e5bb-b7a1-1f4d" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="bc21-e087-dd45-282b" name="New CategoryLink" hidden="false" targetId="d280-b7df-c185-2ba5" primary="true"/>
@@ -1647,6 +1676,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
           <infoLinks>
             <infoLink id="1808-4bd6-72fc-4ad9" name="Anvil of Doom" hidden="false" targetId="17c3-44e8-eb49-193b" type="rule"/>
             <infoLink id="d5ad-a5c7-0251-1676" name="Locus of Power" hidden="false" targetId="b8e0-2cfd-0dae-8e2a" type="rule"/>
+            <infoLink id="fc9b-9177-9254-ec62" name="Anvil of Doom" hidden="false" targetId="6859-c610-8917-4444" type="profile"/>
           </infoLinks>
           <selectionEntries>
             <selectionEntry id="0050-d460-07f2-0833" name="Anvil Guard" hidden="false" collective="false" import="true" type="model">
@@ -1657,20 +1687,39 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
               <infoLinks>
                 <infoLink id="1484-6a2c-3ad2-689e" name="Anvil Guards" hidden="false" targetId="d5ac-7845-cb67-f1f1" type="profile"/>
               </infoLinks>
-              <selectionEntries>
-                <selectionEntry id="cff1-8d66-5375-f916" name="Hand Weapon" hidden="false" collective="true" import="true" type="upgrade">
+              <selectionEntryGroups>
+                <selectionEntryGroup id="7c60-987b-56a7-2c6e" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="8403-f06c-8f68-6f5c">
                   <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="12d5-7e63-0e77-f5ce" type="max"/>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cbe9-7dde-a451-c26e" type="min"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2650-c543-15a0-ad85" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f4e1-29d4-921e-60a5" type="min"/>
                   </constraints>
-                  <infoLinks>
-                    <infoLink id="a63f-b984-e5b6-d226" 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>
+                  <selectionEntries>
+                    <selectionEntry id="8403-f06c-8f68-6f5c" name="Hand Weapon &amp; 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="bf70-d2bc-758c-82ea" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="1f3d-85f9-42e8-eaba" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
+                        <infoLink id="d8b4-f576-b098-9c4e" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="3851-ca4b-8676-00e5" 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="bbaf-ccd7-821c-4269" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="bf72-b79e-720a-1a70" name="Great Weapon" hidden="false" targetId="193e-bc43-b252-8eff" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="1.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
@@ -1702,34 +1751,34 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1fa2-8910-a4bf-b4a6" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="c078-0f15-3220-8a80" name="Gromril Light Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="c078-0f15-3220-8a80" name="Light Armour" 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="92fa-dcde-e7a3-ff93" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="4f80-903a-99a7-b6b8" name="Gromril Light Armour" hidden="false" targetId="e519-9fbd-5902-912b" type="profile"/>
+                <infoLink id="4f80-903a-99a7-b6b8" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="6.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="ffee-0981-1f7b-a8f7" name="Gromril Heavy Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="ffee-0981-1f7b-a8f7" name="Heavy Armour" 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="56c2-f28c-e63d-9f00" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="8819-80b5-b7d1-5da1" name="Gromril Heavy Armour" hidden="false" targetId="6633-a69d-b4c9-b92a" type="profile"/>
+                <infoLink id="191b-fffd-81ed-c2bb" name="Heavy Armour" hidden="false" targetId="8e15-bc32-b40c-bad3" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="80c4-364f-d35d-74f7" name="Gromril Medium Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="80c4-364f-d35d-74f7" name="Medium Armour" 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="b330-3877-764d-fbc5" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="db66-bea5-a375-dc62" name="Gromril Medium Armour" hidden="false" targetId="aa8c-8cb0-30f5-f6a3" type="profile"/>
+                <infoLink id="f35b-fec4-218e-a3a2" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="9.0"/>
@@ -1783,7 +1832,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
         <entryLink id="955b-38fc-779b-2673" name="General" hidden="false" collective="false" import="true" targetId="d322-3c7a-6d1e-7dc2" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="140.0"/>
+        <cost name="pts" typeId="points" value="120.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a79c-83d6-72f9-1063" name="Daemon Slayer" hidden="false" collective="false" import="true" type="model">
@@ -2220,6 +2269,8 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
         <infoLink id="d35b-18f2-a614-398d" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
         <infoLink id="b4e1-22ba-26eb-3a80" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
         <infoLink id="c65b-22bb-3a69-bb58" name="Scouts" hidden="false" targetId="6624-0b7b-c5b8-6397" type="rule"/>
+        <infoLink id="4948-1798-09a6-2bec" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
+        <infoLink id="9752-ea23-72f9-0fe3" name="Beer Gut" hidden="false" targetId="a37b-fbd9-c266-3919" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5199-463d-13ca-d69d" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
@@ -2280,7 +2331,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
         <entryLink id="7741-d06f-fcce-876d" name="General" hidden="false" collective="false" import="true" targetId="d322-3c7a-6d1e-7dc2" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="170.0"/>
+        <cost name="pts" typeId="points" value="185.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7f37-a58a-850a-60bd" name="Thane" hidden="false" collective="false" import="true" type="model">
@@ -2304,6 +2355,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
         <infoLink id="e0f7-5312-abdf-95ca" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
         <infoLink id="82e5-65aa-1b81-2877" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
         <infoLink id="89e0-f714-2139-8381" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
+        <infoLink id="8046-a3de-370d-dfa4" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="f733-114c-c00e-6f0e" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
@@ -2361,34 +2413,34 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="80fa-73b1-3a3e-a828" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="682f-8a3a-a7ae-3e4e" name="Gromril Medium Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="682f-8a3a-a7ae-3e4e" name="Medium Armour" 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="743d-95f8-5ec2-612e" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="7b38-b2fa-ef2f-a03b" name="Gromril Medium Armour" hidden="false" targetId="aa8c-8cb0-30f5-f6a3" type="profile"/>
+                <infoLink id="3f37-1b63-0104-6a39" 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="5db4-4aca-d12a-1b72" name="Gromril Heavy Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="5db4-4aca-d12a-1b72" name="Heavy Armour" 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="6cc2-5cbb-d7d5-a1dd" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="5cd3-bfd5-1a35-027d" name="Gromril Heavy Armour" hidden="false" targetId="6633-a69d-b4c9-b92a" type="profile"/>
+                <infoLink id="ccf7-8fc9-5af2-b517" name="Heavy Armour" hidden="false" targetId="8e15-bc32-b40c-bad3" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="2.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="152f-e6a7-06cb-4bf5" name="Gromril Full Plate Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="152f-e6a7-06cb-4bf5" name="Full Plate Armour" 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="b77a-e93e-8ad6-359c" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="cd03-e508-95fe-b717" name="Gromril Full Plate Armour" hidden="false" targetId="7eb8-a680-5bd0-3e2a" type="profile"/>
+                <infoLink id="5b19-a66d-8563-605c" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="4.0"/>
@@ -2549,6 +2601,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
         <infoLink id="995c-ad2a-623d-705b" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
         <infoLink id="8cd0-6658-7662-67d8" name="Runelore" hidden="false" targetId="ea4e-4c94-bec3-7f03" type="rule"/>
         <infoLink id="2140-ef5c-403a-cfd6" name="Forgefire" hidden="false" targetId="bb72-6ff9-97d0-2b93" type="rule"/>
+        <infoLink id="ed76-8f28-65dc-2311" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="a2e6-9a16-059d-1847" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
@@ -2587,34 +2640,34 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="14e8-b4c0-b67f-78f0" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="9a38-32ff-bb23-71d8" name="Gromril Medium Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="9a38-32ff-bb23-71d8" name="Medium Armour" 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="396c-f18f-37b3-6eae" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="5f3f-eef3-edd4-155f" name="Gromril Medium Armour" hidden="false" targetId="aa8c-8cb0-30f5-f6a3" type="profile"/>
+                <infoLink id="35fc-62e7-72d1-9cd8" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="6.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="b69e-cac1-a84d-e223" name="Gromril Light Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="b69e-cac1-a84d-e223" name="Light Armour" 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="b340-9105-3c31-97ca" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="be51-0396-acce-aad7" name="Gromril Light Armour" hidden="false" targetId="e519-9fbd-5902-912b" type="profile"/>
+                <infoLink id="c0f1-6e4e-8458-8fd5" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="4.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="d268-8884-7239-a473" name="Gromril Heavy Armour" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="d268-8884-7239-a473" name="Heavy Armour" 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="57e3-6a17-2844-62b1" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="2a13-ce8e-555a-2793" name="Gromril Heavy Armour" hidden="false" targetId="6633-a69d-b4c9-b92a" type="profile"/>
+                <infoLink id="6458-9af5-69a4-9d56" name="Heavy Armour" hidden="false" targetId="8e15-bc32-b40c-bad3" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="8.0"/>
@@ -2834,16 +2887,14 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
       </profiles>
       <rules>
         <rule id="04e4-18ae-5e68-44a9" name="Beer Casks" publicationId="aa7b-3583-0834-7bfa" page="145" hidden="false">
-          <description>At the start of each Dwarf turn, the Brewmaster can bestow one of the beers to the unit he is with. Whenever the Brewmaster has given out a draught of brew, roll a D6. If you roll a &apos;1&apos;, he and his unit suffer -1 to their WS, BS and I this turn.</description>
-        </rule>
-        <rule id="28d8-3caa-8a72-74bd" name="Beer Gut" publicationId="aa7b-3583-0834-7bfa" page="145" hidden="false">
-          <description>Enemy attacks against the Brewmaster&apos;s front suffer -1 To Wound.</description>
+          <description>At the start of each Dwarf turn, the Brewmaster can bestow one of the following beers to himself and the unit he is with. Whenever the Brewmaster has given out a draught of brew, roll a D6. If you roll a &apos;1&apos;, he and his unit suffer -1 to their WS, BS and I this turn.</description>
         </rule>
       </rules>
       <infoLinks>
         <infoLink id="21f2-eae7-9b04-024b" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
-        <infoLink id="dc88-6e15-b8b7-3746" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
+        <infoLink id="dc88-6e15-b8b7-3746" name="Beer Gut" hidden="false" targetId="a37b-fbd9-c266-3919" type="rule"/>
         <infoLink id="48f6-55f5-5f9d-bdb2" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
+        <infoLink id="ada3-9202-82e3-66f0" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="dbcb-62bd-954d-479b" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
@@ -3459,18 +3510,6 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
                 <cost name="pts" typeId="points" value="1.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="f38b-57bb-5391-ccc2" 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="3353-9fe4-fc0d-b852" type="max"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ca5-050b-e6df-9a80" type="min"/>
-              </constraints>
-              <infoLinks>
-                <infoLink id="9a53-60f3-3251-a2d3" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
-              </infoLinks>
-              <costs>
-                <cost name="pts" typeId="points" value="0.0"/>
-              </costs>
-            </selectionEntry>
             <selectionEntry id="f5be-336d-ff36-2775" name="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="a32c-e86c-6098-262a" type="max"/>
@@ -3515,6 +3554,36 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
                 </selectionEntry>
               </selectionEntries>
             </selectionEntryGroup>
+            <selectionEntryGroup id="cc84-aaa2-ac35-ebb9" name="Armour" hidden="false" collective="false" import="true" defaultSelectionEntryId="ce5f-88c2-8dd2-7d47">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c5a9-7e47-60aa-c25f" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="83f6-5bf5-ffbd-0dcd" type="min"/>
+              </constraints>
+              <selectionEntries>
+                <selectionEntry id="ce5f-88c2-8dd2-7d47" 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="3d32-03ee-3302-81e1" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="3a6c-5d45-2fc6-e28d" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+                <selectionEntry id="35a9-5b34-fdc6-0aec" 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="48bd-4a73-c5ec-fb30" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="e4b2-faf1-bcf2-7472" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="1.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+            </selectionEntryGroup>
           </selectionEntryGroups>
           <costs>
             <cost name="pts" typeId="points" value="12.0"/>
@@ -3607,18 +3676,6 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
                 <cost name="pts" typeId="points" value="1.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="a615-82ad-08b9-5514" 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="89d4-3440-efbd-7fbb" type="max"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eb97-59d7-ac00-23fe" type="min"/>
-              </constraints>
-              <infoLinks>
-                <infoLink id="5484-044e-354c-b699" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
-              </infoLinks>
-              <costs>
-                <cost name="pts" typeId="points" value="0.0"/>
-              </costs>
-            </selectionEntry>
             <selectionEntry id="1711-7f6b-0630-e6ef" name="Dwarf 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="3e36-8f5c-7ddf-e9eb" type="max"/>
@@ -3645,6 +3702,38 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
               </costs>
             </selectionEntry>
           </selectionEntries>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="bee9-bdd9-83e1-ec9b" name="Armour" hidden="false" collective="false" import="true" defaultSelectionEntryId="7cc3-4583-ba83-cc69">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b74c-8cb6-4075-60da" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2d0d-6911-8615-664a" type="min"/>
+              </constraints>
+              <selectionEntries>
+                <selectionEntry id="7cc3-4583-ba83-cc69" 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="41f1-60b0-f68c-f323" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="2cc6-ffa3-6b3e-2e45" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
+                <selectionEntry id="853b-57e2-f121-9bf0" 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="c5d1-a717-b8cd-0506" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="54d2-52e3-1781-146e" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="1.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
           <costs>
             <cost name="pts" typeId="points" value="13.0"/>
           </costs>
@@ -3932,6 +4021,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
             <infoLink id="987b-167a-c4d4-1e37" name="Ancestral Grudge" hidden="false" targetId="73fd-d115-269d-bd0a" type="rule"/>
             <infoLink id="9f3a-8af7-f953-7812" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
             <infoLink id="c41d-98fd-41d5-5fc9" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
+            <infoLink id="1503-17a9-bc14-672d" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
           </infoLinks>
           <selectionEntries>
             <selectionEntry id="1096-455d-81ac-a2a4" name="Shield" hidden="false" collective="true" import="true" type="upgrade">
@@ -3958,12 +4048,12 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="fca2-6c4f-6c05-1e1f" name="Gromril Full Plate Armour" hidden="false" collective="true" import="true" type="upgrade">
+            <selectionEntry id="fca2-6c4f-6c05-1e1f" name="Full Plate 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="d8da-ad7f-e754-7e8a" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="f2cc-673f-44e1-bad7" name="Gromril Full Plate Armour" hidden="false" targetId="7eb8-a680-5bd0-3e2a" type="profile"/>
+                <infoLink id="ad31-3623-5e24-e761" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
@@ -5556,6 +5646,7 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
             <infoLink id="517e-a642-b828-9af8" name="Relentless" hidden="false" targetId="db34-00cf-d5b6-9a4d" type="rule"/>
             <infoLink id="9cf8-6941-5004-470d" name="Resolute" hidden="false" targetId="7da8-9e3b-77c9-cc8a" type="rule"/>
             <infoLink id="6fc7-ada5-397a-87fc" name="Immunity (Flaming Attacks)" hidden="false" targetId="49c7-526e-cb3e-d7b7" type="rule"/>
+            <infoLink id="58b8-5cb5-b428-f0f6" name="Gromril Armour" hidden="false" targetId="6502-468e-b48f-4540" type="rule"/>
           </infoLinks>
           <selectionEntries>
             <selectionEntry id="4a87-ad3d-370c-3568" name="Drakegun" hidden="false" collective="true" import="true" type="upgrade">
@@ -5582,12 +5673,12 @@ The White Dwarf may reveal his true self at the start of any Close Combat phase.
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="f86c-cb0c-b565-4c6e" name="Gromril Full Plate Armour" hidden="false" collective="true" import="true" type="upgrade">
+            <selectionEntry id="f86c-cb0c-b565-4c6e" name="Full Plate 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="aed4-c6be-fd78-527e" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="3d74-5306-2b45-348a" name="Gromril Full Plate Armour" hidden="false" targetId="7eb8-a680-5bd0-3e2a" type="profile"/>
+                <infoLink id="e5c2-98e4-41b5-72da" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
@@ -6527,7 +6618,10 @@ The number of shots fired by the Organ Gun is equal to the total of both artille
         </profile>
       </profiles>
       <rules>
-        <rule id="5c25-14cf-3176-95b1" name="Dive Bomb" publicationId="aa7b-3583-0834-7bfa" page="175" hidden="false">
+        <rule id="5c25-14cf-3176-95b1" name="Gyrocopter" publicationId="aa7b-3583-0834-7bfa" page="224" hidden="false">
+          <description>You may take 0-2 Gyrocopters as a single Rare choice.</description>
+        </rule>
+        <rule id="c862-6489-bf61-dbcf" name="Dive Bomb" publicationId="aa7b-3583-0834-7bfa" page="175" hidden="false">
           <description>Once per game, during the Remaining Moves sub-phase, models with this special rule may drop bombs unless they are fleeing or have declared a charge that turn.
 
 To Dive Bomb, select one unengaged enemy unit that the Gyrocopter moved over in that turn. To determine the damage caused by the bombs, roll an artillery dice; this is the number of hits inflicted. If a misfire is rolled, the Gyrocopter takes a single Wound with no armour save allowed.
@@ -8548,32 +8642,29 @@ on a roll of 2+, has Multiple Wounds (D3) and no ward saves can be taken against
       <description>Units entirely composed of models with this rule do not need to pass a LD test in order to march, regardless of the proximity of enemy units.</description>
     </rule>
     <rule id="7da8-9e3b-77c9-cc8a" name="Resolute" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false">
-      <description>The models roll 3D6 for any Break tests taken in the first round of combat, and discard the highest dice.</description>
+      <description>When taking Break tests, models with this rule count as having lost the combat with 1 point fewer than they actually have.</description>
     </rule>
     <rule id="59e6-d52c-a438-cc94" name="Oathstone" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false">
-      <description>A unit that contains one or more models with an Oath Stone can never choose to flee as a charge reaction, cannot be disrupted and, if any of its models are armed with hand weapon and shield, they can make Parry saves against attacks made to their flanks and rear. Furthermore, a character with an Oath Stone must always accept a challenge (if your unit contains more than one character with an Oath Stone, you can choose which of them accepts the challenge).</description>
+      <description>A unit that contains one or more models with an Oath Stone can never choose to flee as a charge reaction, cannot be disrupted and, if any of its models are armed with hand weapon and shield, they can make Parry saves against attacks made to their flanks and rear. In addition, the presence of the stone with the unit confers Magic Resistance (1) as its runes act to absorb wild magic. Furthermore, a character with an Oath Stone must always accept a challenge (if your unit contains more than one character with an Oath Stone, you can choose which of them accepts the challenge). However, if a model on an Oathstone fails a Break Test, he is removed as a casualty as he fights to the very last.</description>
     </rule>
     <rule id="a0d2-719d-c2ef-627e" name="Shieldbearers" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false">
-      <description>Shieldbearers follow the rules for Mounts, and gives the whole model Unit Strength 3.</description>
+      <description>Shieldbearers should be placed on a 40x20mm base and add +2 to the Unit Strength of any model mounted on them.</description>
     </rule>
     <rule id="bb72-6ff9-97d0-2b93" name="Forgefire" publicationId="aa7b-3583-0834-7bfa" page="139" hidden="false">
-      <description>A Runesmith and Runelord, and all friendly infantry models in a unit joined by one of them, gain Armour Piercing (1) for as long as they remain with the unit.</description>
+      <description>A Runesmith and Runelord, and all friendly infantry models in a unit joined by one or more of them, gain Armour Piercing (1) for as long as they remain with the unit.</description>
     </rule>
     <rule id="ea4e-4c94-bec3-7f03" name="Runelore" publicationId="aa7b-3583-0834-7bfa" page="139" hidden="false">
       <description>A Runesmith/Runelord follows the rules for a Level 2/4 Wizard for the purposes of dispelling, and have Magic Resistance (1/2), respectively.</description>
     </rule>
     <rule id="b8e0-2cfd-0dae-8e2a" name="Locus of Power" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false">
-      <description>If you have one or more Anvils of Doom on the battlefield at the start of any Magic phase, add one dice to both your power and your dispel pool.</description>
+      <description>For each friendly Anvil of Doom on the battlefield at the start of any Magic phase, add one dice to both your power and your dispel pool.</description>
     </rule>
     <rule id="17c3-44e8-eb49-193b" name="Anvil of Doom" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false">
-      <description>A Runelord with an Anvil of Doom gains +2 to his W characteristic. He also gains Ward Save (5+) and Unbreakable. In addition, his troop type changes to War Machine with the following rules:
-
-A Runelord, his Anvil Guards and his Anvil of Doom are treated as single model – the Runelord cannot dismount. There are, however, two sets of characteristics, one for the Runelord and one shared profile for the Anvil Guards. The Runelord and the Anvil Guards use their own WS, S, I and A characteristics when they attack. Each can attack any opponent in base contact. The Anvil Guards’ Attacks do not benefit from any weapon, runic or otherwise, carried by the Runelord.
-
-The Anvil Guards and the Anvil have no W or T values, and can therefore never be attacked separately. However, if the Runelord is removed as a casualty, we assume that the Anvil Guards were slain alongside their master and the whole model is removed from play. If the model is attacked in close combat, it is the Runelord’s WSl that is used for the purposes of the enemy rolling To Hit.</description>
+      <description>A Runelord with an Anvil of Doom gains Ward Save (4+) and Unbreakable. In addition, his troop type changes to War Machine and he counts as being part of the crew. The Runelord can never choose to leave the Anvil during the game. If the Runelord is killed, the whole Anvil is also removed as a casualty.</description>
     </rule>
     <rule id="01a2-3b93-87d9-b91e" name="Strike the Runes" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false">
-      <description>A model mounted on an Anvil of Doom can use each of the following bound spells once per friendly Magic Phase. The Anvil can pivot on the spot before casting, and the range of the bound spells is measured from the Anvil itself.</description>
+      <description>A model mounted on an Anvil of Doom can use each of the following bound spells once per friendly Magic Phase. In addition, it may use up to
+4 Power Dice when attempting to cast each spell. The Anvil can pivot on the spot before casting, and the range of the bound spells is measured from the Anvil itself.</description>
     </rule>
     <rule id="3f1d-5a74-f98c-bf18" name="Artillery Master" publicationId="aa7b-3583-0834-7bfa" page="143" hidden="false">
       <description>If a Master Engineer is not fleeing, a single war machine that is within 3&quot; of him can use his BS and re-roll one artillery dice during the Shooting phase. This cannot be the artillery dice that determines the distance a cannonball bounces or a
@@ -8605,6 +8696,12 @@ After resolving the damage caused by a grudge buster bomb, roll a D6. On a 4+, t
     <rule id="1707-3abf-d5c8-97c0" name="Deathblow" publicationId="aa7b-3583-0834-7bfa" page="160" hidden="false">
       <description>If a Slayer is killed by normal Close Combat Attacks, it will immediately make a single Attack back against the unit or model that killed it before the Slayer is removed as a casualty.</description>
     </rule>
+    <rule id="6502-468e-b48f-4540" name="Gromril Armour" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false">
+      <description>Models with this rule add +1 to their armour saves if they wear light, medium, heavy or full plate armour.</description>
+    </rule>
+    <rule id="a37b-fbd9-c266-3919" name="Beer Gut" publicationId="aa7b-3583-0834-7bfa" page="145" hidden="false">
+      <description>Enemy attacks against the Brewmaster&apos;s front suffer -1 To Wound.</description>
+    </rule>
   </sharedRules>
   <sharedProfiles>
     <profile id="a639-e694-8e14-945e" name="Dwarf Handgun" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
@@ -8614,22 +8711,22 @@ After resolving the damage caused by a grudge buster bomb, roll a D6. On a 4+, t
         <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Armour Piercing (1). Move or Fire.</characteristic>
       </characteristics>
     </profile>
-    <profile id="c578-94dc-987e-f225" name="Rune of Hearth and Home" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
+    <profile id="c578-94dc-987e-f225" name="Rune of Hearth and Hold" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
       <characteristics>
         <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">Innate bound spell</characteristic>
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">3+</characteristic>
-        <characteristic name="Range" typeId="2954-76ea-decb-30ff">24&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Targets every friendly Dwarf unit in range. The target units gain Immune (Psychology) until the start of the next friendly Magic phase.</characteristic>
+        <characteristic name="Range" typeId="2954-76ea-decb-30ff"/>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Targets a single friendly Dwarf unit anywhere on the battlefield. The target unit gains Stubborn until the start of the next friendly Magic phase. If the unit is already Stubborn, it becomes Unbreakable instead.</characteristic>
       </characteristics>
     </profile>
-    <profile id="e4f2-da0b-5be2-af74" name="Rune of Oath and Steel" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
+    <profile id="e4f2-da0b-5be2-af74" name="Rune of Oath and Honour" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
       <characteristics>
         <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">Innate bound spell</characteristic>
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
-        <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">4+</characteristic>
+        <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">5+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff"/>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Targets a single friendly Dwarf unit anywhere on the battlefield. The target unit increases their armour save by 1 (to a maximum of 1+) until the start of the next friendly Magic phase.</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Targets a single friendly Dwarf unit anywhere on the battlefield. The target unit may immediately make an additional move as if were the Remaining Moves sub-phase.</characteristic>
       </characteristics>
     </profile>
     <profile id="71b8-c2ff-e35a-4ea3" name="Rune of Wrath and Ruin" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
@@ -8809,34 +8906,6 @@ After resolving the damage caused by a grudge buster bomb, roll a D6. On a 4+, t
         <characteristic name="Type" typeId="13f9-a26b-05af-3459">Infantry</characteristic>
       </characteristics>
     </profile>
-    <profile id="6633-a69d-b4c9-b92a" name="Gromril Heavy Armour" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false" typeId="884c-d50e-eeb6-eda0" typeName="Armour">
-      <characteristics>
-        <characteristic name="Combat" typeId="168d-1cc2-66f3-e766">3+</characteristic>
-        <characteristic name="Missile" typeId="97ea-ecf7-8d24-b2ca">3+</characteristic>
-        <characteristic name="Special Rules" typeId="ff58-91e4-84d7-e6e4"/>
-      </characteristics>
-    </profile>
-    <profile id="7eb8-a680-5bd0-3e2a" name="Gromril Full Plate Armour" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false" typeId="884c-d50e-eeb6-eda0" typeName="Armour">
-      <characteristics>
-        <characteristic name="Combat" typeId="168d-1cc2-66f3-e766">2+</characteristic>
-        <characteristic name="Missile" typeId="97ea-ecf7-8d24-b2ca">2+</characteristic>
-        <characteristic name="Special Rules" typeId="ff58-91e4-84d7-e6e4"/>
-      </characteristics>
-    </profile>
-    <profile id="e519-9fbd-5902-912b" name="Gromril Light Armour" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false" typeId="884c-d50e-eeb6-eda0" typeName="Armour">
-      <characteristics>
-        <characteristic name="Combat" typeId="168d-1cc2-66f3-e766">5+</characteristic>
-        <characteristic name="Missile" typeId="97ea-ecf7-8d24-b2ca">5+</characteristic>
-        <characteristic name="Special Rules" typeId="ff58-91e4-84d7-e6e4"/>
-      </characteristics>
-    </profile>
-    <profile id="aa8c-8cb0-30f5-f6a3" name="Gromril Medium Armour" publicationId="aa7b-3583-0834-7bfa" page="136" hidden="false" typeId="884c-d50e-eeb6-eda0" typeName="Armour">
-      <characteristics>
-        <characteristic name="Combat" typeId="168d-1cc2-66f3-e766">4+</characteristic>
-        <characteristic name="Missile" typeId="97ea-ecf7-8d24-b2ca">4+</characteristic>
-        <characteristic name="Special Rules" typeId="ff58-91e4-84d7-e6e4"/>
-      </characteristics>
-    </profile>
     <profile id="9208-26f4-7d27-4cdd" name="Master Rune of Skalf Blackhammer" publicationId="aa7b-3583-0834-7bfa" page="201" hidden="false" typeId="be21-8ba1-7009-d43e" typeName="Weapon Rune">
       <characteristics>
         <characteristic name="Effect" typeId="daeb-8a2c-9eae-f2dd">A weapon engraved with the Master Rune of Skalf Blackhammer will Wound any model not in magic armour on a To Wound roll of 2+, regardless of the target&apos;s T. Against models in magic armour, a roll of 3+ is required.</characteristic>
@@ -8954,6 +9023,29 @@ A second Rune of Spell breaking maintains the previous effect and, after the spe
         <characteristic name="Effect" typeId="daeb-8a2c-9eae-f2dd">A weapon engraved with the Master Rune of Smiting causes Multiple Wounds (D6).</characteristic>
       </characteristics>
     </profile>
+    <profile id="6859-c610-8917-4444" name="Anvil of Doom" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
+      <characteristics>
+        <characteristic name="M" typeId="09ad-18df-607b-1215"/>
+        <characteristic name="WS" typeId="f049-8a65-9c04-1559"/>
+        <characteristic name="BS" typeId="7b67-9dfa-eeac-d007"/>
+        <characteristic name="S" typeId="edd2-7979-54a4-6b35"/>
+        <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">10</characteristic>
+        <characteristic name="W" typeId="27ee-0675-122f-a1b1"/>
+        <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
+        <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
+        <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">War Machine</characteristic>
+      </characteristics>
+    </profile>
+    <profile id="6b4d-ca97-1223-ca26" name="Rune of Stone and Steel" publicationId="aa7b-3583-0834-7bfa" page="141" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
+      <characteristics>
+        <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">Innate bound spell</characteristic>
+        <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
+        <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">4+</characteristic>
+        <characteristic name="Range" typeId="2954-76ea-decb-30ff"/>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Targets a single friendly Dwarf unit anywhere on the battlefield. The target unit increases their armour save by 1 (to a maximum of 1+) until the start of the next friendly Magic phase.</characteristic>
+      </characteristics>
+    </profile>
   </sharedProfiles>
   <catalogueLinks>
     <catalogueLink id="1b68-4e48-8b52-ba25" name="Regiments of Renown" targetId="b68c-fa06-aafb-abce" type="catalogue" importRootEntries="true"/>
diff --git a/Empire.cat b/Empire.cat
index 18478a7..3db2ef3 100644
--- a/Empire.cat
+++ b/Empire.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="5941-78ef-698e-a105" name="Empire" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="7" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="5941-78ef-698e-a105" name="Empire" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="901c-8001-972f-89d7" name="Pigeon Bomb Table">
       <characteristicTypes>
@@ -198,7 +198,7 @@
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="45.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="75ca-cdd2-199f-af80" name="Deathclaw" hidden="false" collective="false" import="true" type="model">
@@ -698,7 +698,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -725,7 +726,7 @@
         <entryLink id="005d-1f2d-baa8-3f91" name="General" hidden="false" collective="false" import="true" targetId="d322-3c7a-6d1e-7dc2" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="365.0"/>
+        <cost name="pts" typeId="points" value="350.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c0b3-6442-c70e-d7cb" name="Thyrus Gormann" hidden="false" collective="false" import="true" type="model">
@@ -788,7 +789,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -3872,7 +3874,7 @@
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="45.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="4e2a-b809-f24b-8858" name="Imperial Griffon" hidden="false" collective="false" import="true" type="model">
@@ -3975,7 +3977,7 @@
                 <infoLink id="090b-5604-721a-335b" name="Lance (Mounted)" hidden="false" targetId="e56e-fedf-c550-5d81" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="3.0"/>
+                <cost name="pts" typeId="points" value="8.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="cebb-9c7f-3f34-b3a4" name="Great Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -3986,7 +3988,7 @@
                 <infoLink id="a01c-23da-ef9c-04ec" name="Great Weapon" hidden="false" targetId="193e-bc43-b252-8eff" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="6.0"/>
+                <cost name="pts" typeId="points" value="8.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="f893-6dbb-8659-59b0" name="Two/Additional Hand Weapons" hidden="false" collective="false" import="true" type="upgrade">
@@ -4001,6 +4003,13 @@
               </costs>
             </selectionEntry>
             <selectionEntry id="cab8-7b6d-b4ae-62ac" name="Polearm/Halberd" hidden="false" collective="false" import="true" type="upgrade">
+              <modifiers>
+                <modifier type="set" field="e199-bb22-867b-8377" value="0.0">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="65f0-091d-16af-78ab" type="atLeast"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e199-bb22-867b-8377" type="max"/>
               </constraints>
@@ -4008,7 +4017,7 @@
                 <infoLink id="efe9-afca-bc00-cbaa" name="Polearm/Halberd" hidden="false" targetId="e43e-5153-eeec-36be" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="6.0"/>
+                <cost name="pts" typeId="points" value="8.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="9ffa-f8a7-ebb0-0055" name="Hand Weapon &amp; Pistol" hidden="false" collective="false" import="true" type="upgrade">
@@ -4020,7 +4029,7 @@
                 <infoLink id="a97e-7490-16c8-7d3d" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="3.0"/>
+                <cost name="pts" typeId="points" value="6.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4038,7 +4047,7 @@
                 <infoLink id="58a1-0c73-2bc7-a5dd" name="Handgun" hidden="false" targetId="bd57-9e45-342f-ee49" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="3.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="24ac-1a81-4860-3f67" name="Bow" hidden="false" collective="false" import="true" type="upgrade">
@@ -4049,7 +4058,7 @@
                 <infoLink id="b54d-9b50-d299-18dd" name="Bow" hidden="false" targetId="9dcd-3be8-08b0-96ab" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="3.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4170,7 +4179,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -4209,7 +4219,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -4310,7 +4321,7 @@
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="45.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="03ad-c5a0-c732-a519" name="Imperial Griffon" hidden="false" collective="false" import="true" type="model">
@@ -5210,7 +5221,7 @@ No more than one Wound can be re-allocated to Ludwig Schwarzhelm in this way in
                 <infoLink id="41b6-3ef0-c3af-cf57" name="Lance (Mounted)" hidden="false" targetId="e56e-fedf-c550-5d81" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="4.0"/>
+                <cost name="pts" typeId="points" value="6.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="3819-a6f2-9741-04c0" name="Great Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -5221,7 +5232,7 @@ No more than one Wound can be re-allocated to Ludwig Schwarzhelm in this way in
                 <infoLink id="5725-c95f-13f1-a1a9" name="Great Weapon" hidden="false" targetId="193e-bc43-b252-8eff" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="4.0"/>
+                <cost name="pts" typeId="points" value="6.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="465a-5941-43b1-d1d9" name="Two/Additional Hand Weapons" hidden="false" collective="false" import="true" type="upgrade">
@@ -5236,6 +5247,13 @@ No more than one Wound can be re-allocated to Ludwig Schwarzhelm in this way in
               </costs>
             </selectionEntry>
             <selectionEntry id="9445-c269-e88c-5f57" name="Polearm/Halberd" hidden="false" collective="false" import="true" type="upgrade">
+              <modifiers>
+                <modifier type="set" field="e6ba-c855-7753-f6de" value="0.0">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6b50-0297-de5a-d02b" type="atLeast"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e6ba-c855-7753-f6de" type="max"/>
               </constraints>
@@ -5243,7 +5261,7 @@ No more than one Wound can be re-allocated to Ludwig Schwarzhelm in this way in
                 <infoLink id="931b-99b2-d235-7c8f" name="Polearm/Halberd" hidden="false" targetId="e43e-5153-eeec-36be" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="4.0"/>
+                <cost name="pts" typeId="points" value="6.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="f6a3-8d3e-6b44-a29a" name="Hand Weapon &amp; Pistol" hidden="false" collective="false" import="true" type="upgrade">
@@ -5400,7 +5418,7 @@ No more than one Wound can be re-allocated to Ludwig Schwarzhelm in this way in
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="45.0"/>
+                <cost name="pts" typeId="points" value="20.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -5502,7 +5520,8 @@ No more than one Wound can be re-allocated to Ludwig Schwarzhelm in this way in
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -5541,7 +5560,8 @@ No more than one Wound can be re-allocated to Ludwig Schwarzhelm in this way in
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -7160,7 +7180,7 @@ also choose to shoot at the primary quarry as if he had Sniper.</description>
                 <infoLink id="a5ca-e517-99f5-dc67" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="70c8-9644-747a-b583" name="Outrider" hidden="false" collective="false" import="true" type="upgrade">
@@ -8664,6 +8684,7 @@ also choose to shoot at the primary quarry as if he had Sniper.</description>
                     <infoLink id="b482-4de7-646e-fa24" name="Vampire Slayers" hidden="false" targetId="9b3a-0642-04ef-807a" type="rule"/>
                     <infoLink id="6e92-91e4-c4cc-a88d" name="Pariahs" hidden="false" targetId="f08c-2f16-eee1-d264" type="rule"/>
                     <infoLink id="10bb-1f06-5575-413e" name="Knight" hidden="false" targetId="Knight (Cav)" type="profile"/>
+                    <infoLink id="6339-2f44-aa72-fd79" name="Immunity (Fear)" hidden="false" targetId="9fed-6076-6c75-b774" type="rule"/>
                   </infoLinks>
                   <selectionEntries>
                     <selectionEntry id="cd0f-f77f-4f34-7151" name="Warhorse" hidden="false" collective="true" import="true" type="model">
@@ -12378,7 +12399,7 @@ In addition, friendly units within 6&quot; of Flagellants suffer -1 to their LD,
                 <infoLink id="fd88-7b11-a567-8346" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="efa7-035c-7ee4-570c" name="Sharpshooter" hidden="false" collective="false" import="true" type="upgrade">
@@ -15686,6 +15707,7 @@ In addition, friendly units within 6&quot; of Flagellants suffer -1 to their LD,
                     <infoLink id="0f74-26aa-31e3-cf3d" name="Vampire Slayers" hidden="false" targetId="9b3a-0642-04ef-807a" type="rule"/>
                     <infoLink id="3bb9-0676-0b29-95b1" name="Pariahs" hidden="false" targetId="f08c-2f16-eee1-d264" type="rule"/>
                     <infoLink id="6ee8-6a03-b1ea-557e" name="Inner Circle Knight" hidden="false" targetId="Inner Circle Knight (Cav)" type="profile"/>
+                    <infoLink id="9563-5fea-87c9-8c9e" name="Immunity (Fear)" hidden="false" targetId="9fed-6076-6c75-b774" type="rule"/>
                   </infoLinks>
                   <selectionEntries>
                     <selectionEntry id="b0ce-73f5-e41c-acf9" name="Warhorse" hidden="false" collective="true" import="true" type="model">
@@ -16983,12 +17005,12 @@ If a Misfire is rolled, roll immediately on the Black Powder Misfire chart befor
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8280-0731-4a4a-a514" type="min"/>
                       </constraints>
                       <selectionEntries>
-                        <selectionEntry id="0756-a005-9224-ed47" name="Repeater Handgun" hidden="false" collective="false" import="true" type="upgrade">
+                        <selectionEntry id="0756-a005-9224-ed47" name="Repeater Pistol" 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="471a-4759-1687-655b" type="max"/>
                           </constraints>
                           <infoLinks>
-                            <infoLink id="fec5-b1f7-9df2-140e" name="Repeater Handgun" hidden="false" targetId="e75c-712e-ec8b-35e9" type="profile"/>
+                            <infoLink id="fec5-b1f7-9df2-140e" name="Repeater Pistol" hidden="false" targetId="a7ff-a800-3ccc-4381" type="profile"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -17074,12 +17096,12 @@ If a Misfire is rolled, roll immediately on the Black Powder Misfire chart befor
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8e7a-d84f-200f-a86e" type="min"/>
                       </constraints>
                       <selectionEntries>
-                        <selectionEntry id="1ae2-2654-80e3-3385" name="Repeater Handgun" hidden="false" collective="false" import="true" type="upgrade">
+                        <selectionEntry id="1ae2-2654-80e3-3385" name="Repeater Pistol" 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="2ee9-a515-508f-233d" type="max"/>
                           </constraints>
                           <infoLinks>
-                            <infoLink id="1f31-cc05-c37e-43e3" name="Repeater Handgun" hidden="false" targetId="e75c-712e-ec8b-35e9" type="profile"/>
+                            <infoLink id="1f31-cc05-c37e-43e3" name="Repeater Pistol" hidden="false" targetId="a7ff-a800-3ccc-4381" type="profile"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -17164,12 +17186,12 @@ If a Misfire is rolled, roll immediately on the Black Powder Misfire chart befor
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="da35-006f-9d60-5d8e" type="min"/>
                       </constraints>
                       <selectionEntries>
-                        <selectionEntry id="e41e-7750-3bca-fe53" name="Repeater Handgun" hidden="false" collective="false" import="true" type="upgrade">
+                        <selectionEntry id="e41e-7750-3bca-fe53" name="Repeater Pistol" 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="a1b7-3143-2ca1-6931" type="max"/>
                           </constraints>
                           <infoLinks>
-                            <infoLink id="1f0f-d6f8-3cd9-0b3b" name="Repeater Handgun" hidden="false" targetId="e75c-712e-ec8b-35e9" type="profile"/>
+                            <infoLink id="1f0f-d6f8-3cd9-0b3b" name="Repeater Pistol" hidden="false" targetId="a7ff-a800-3ccc-4381" type="profile"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -17249,12 +17271,12 @@ If a Misfire is rolled, roll immediately on the Black Powder Misfire chart befor
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0ebd-d940-ca83-25dc" type="min"/>
                       </constraints>
                       <selectionEntries>
-                        <selectionEntry id="1cd0-360d-2b1f-4c6c" name="Repeater Handgun" hidden="false" collective="false" import="true" type="upgrade">
+                        <selectionEntry id="1cd0-360d-2b1f-4c6c" name="Repeater Pistol" 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="dbf4-e27d-f25f-1004" type="max"/>
                           </constraints>
                           <infoLinks>
-                            <infoLink id="47e0-1874-65c2-bade" name="Repeater Handgun" hidden="false" targetId="e75c-712e-ec8b-35e9" type="profile"/>
+                            <infoLink id="47e0-1874-65c2-bade" name="Repeater Pistol" hidden="false" targetId="a7ff-a800-3ccc-4381" type="profile"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
diff --git a/Estalia.cat b/Estalia.cat
index fd89b2e..d11b9ce 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="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="290c-8805-073e-3492" name="Estalia" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="e5cf-9291-e237-c43a" name="Duelling Techniques">
       <characteristicTypes>
@@ -955,7 +955,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -991,7 +992,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1731,6 +1733,13 @@
           </constraints>
           <selectionEntries>
             <selectionEntry id="50b7-71c9-58ee-668f" name="Army Battle Standard" hidden="false" collective="false" import="true" type="upgrade">
+              <modifiers>
+                <modifier type="set" field="2a84-c518-9cc2-486e" value="0.0">
+                  <conditions>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="6c59-16f0-9091-6911" type="atLeast"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2a84-c518-9cc2-486e" type="max"/>
                 <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" id="a737-e837-3a5f-060d" type="max"/>
@@ -1992,7 +2001,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2028,7 +2038,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2290,6 +2301,13 @@
           </costs>
         </selectionEntry>
         <selectionEntry id="6c59-16f0-9091-6911" name="Altar of Myrmidia" hidden="false" collective="false" import="true" type="model">
+          <modifiers>
+            <modifier type="set" field="2126-6cdb-15d9-332c" value="0.0">
+              <conditions>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="50b7-71c9-58ee-668f" type="atLeast"/>
+              </conditions>
+            </modifier>
+          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2126-6cdb-15d9-332c" type="max"/>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="d785-e320-8603-e3e7" type="max"/>
diff --git a/Halflings.cat b/Halflings.cat
index 96011e9..01e468d 100644
--- a/Halflings.cat
+++ b/Halflings.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="9a34-2536-da13-b61a" name="Halflings" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="9a34-2536-da13-b61a" name="Halflings" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="2c91-98f0-3a1f-f198" name="Before Battle Meal Table">
       <characteristicTypes>
@@ -741,7 +741,8 @@ Any magic item can be drawn out of the &apos;Swag&apos; Bag, but special items t
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1375,7 +1376,8 @@ Any magic item can be drawn out of the &apos;Swag&apos; Bag, but special items t
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
diff --git a/High_Elves.cat b/High_Elves.cat
index 66979c8..0e872a6 100644
--- a/High_Elves.cat
+++ b/High_Elves.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="84ba-6417-bc80-b286" name="High Elves" revision="5" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="4" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="84ba-6417-bc80-b286" name="High Elves" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="cfe9-a815-09c1-fecd" name="Attuned to Magic table">
       <characteristicTypes>
@@ -224,7 +224,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -377,7 +378,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -583,7 +585,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
               </characteristics>
             </profile>
           </profiles>
@@ -940,7 +943,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1207,7 +1211,7 @@
             </selectionEntry>
           </selectionEntries>
           <costs>
-            <cost name="pts" typeId="points" value="80.0"/>
+            <cost name="pts" typeId="points" value="85.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -1319,6 +1323,36 @@
                 <infoLink id="f2b6-b7c2-bc65-0a75" name="Stomp" hidden="false" targetId="668c-19e8-b764-8549" type="rule"/>
                 <infoLink id="ddd5-e494-76f4-f5dd" name="Griffon" hidden="false" targetId="d1a3-6033-a3db-0081" type="profile"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="fbfd-c9e9-9acd-580f" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="ada7-dc21-9f4a-e599" name="Shredding Talons" 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="59b1-e8da-5b34-e106" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="5b0f-5d4e-5bbd-b374" name="Shredding Talons" hidden="false" targetId="9e3d-1310-6e26-37de" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="04bc-8f7d-5525-52fe" name="Swooping Strike" 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="b29a-8b32-27e4-9865" type="max"/>
+                      </constraints>
+                      <rules>
+                        <rule id="dfce-17b3-6888-497f" name="Swooping Strike" publicationId="b724-d2c4-d151-2d9e" page="181" hidden="false">
+                          <description>The model gains Devastating Charge.</description>
+                        </rule>
+                      </rules>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="150.0"/>
               </costs>
@@ -1334,7 +1368,7 @@
                 <infoLink id="a177-9e37-19b8-6db0" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="50.0"/>
+                <cost name="pts" typeId="points" value="40.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="52d8-eccb-88b3-2717" name="Elven Steed" hidden="false" collective="false" import="true" type="model">
@@ -1374,6 +1408,34 @@
                 <infoLink id="7e72-b10e-29e3-5d1b" name="Great Eagle" hidden="false" targetId="1ef4-a0a6-240d-c10d" type="profile"/>
                 <infoLink id="b7d0-cd77-0a46-19d1" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="a90e-3d28-7e89-e606" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="830f-d353-4646-a9a3" name="Shredding Talons" 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="320e-4eee-e61a-f039" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="37ee-b6c9-d6fc-0b66" name="Shredding Talons" hidden="false" targetId="9e3d-1310-6e26-37de" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="5bfa-6112-1ffa-b421" name="Swiftsense" 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="7118-2cf2-5768-1042" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="7ed2-0122-390f-9350" name="Swiftsense" hidden="false" targetId="dd27-cab8-48e1-6354" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="65.0"/>
               </costs>
@@ -1491,6 +1553,18 @@
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="d991-06b6-0110-b6f4" name="Lion Cloak" 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="451f-2a5b-5917-3730" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="349a-d91d-aa85-9f2c" type="min"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="6212-34f9-af8e-4643" name="Lion Cloak" hidden="false" targetId="59c2-04c7-02d5-c509" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -1818,7 +1892,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1858,7 +1933,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1931,6 +2007,34 @@
                 <infoLink id="f558-fccd-fea6-0edd" name="Great Eagle" hidden="false" targetId="1ef4-a0a6-240d-c10d" type="profile"/>
                 <infoLink id="8154-ae90-d600-3d96" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="2ab8-053f-492c-cbe4" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="9e58-daa6-aed2-d46f" name="Shredding Talons" 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="0f8a-d72a-d738-addb" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="9177-3b99-8465-48ff" name="Shredding Talons" hidden="false" targetId="9e3d-1310-6e26-37de" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="0c91-3f0f-3a3a-5677" name="Swiftsense" 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="023a-3c10-6752-06d8" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="9f5a-fb3a-eba9-655a" name="Swiftsense" hidden="false" targetId="dd27-cab8-48e1-6354" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="65.0"/>
               </costs>
@@ -1984,7 +2088,7 @@
                 <infoLink id="c8a0-8d29-8479-d4c5" name="Impale" hidden="false" targetId="0eea-3c8d-ec56-3333" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="55.0"/>
+                <cost name="pts" typeId="points" value="50.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2236,7 +2340,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -2382,6 +2487,18 @@
                     <cost name="pts" typeId="points" value="0.0"/>
                   </costs>
                 </selectionEntry>
+                <selectionEntry id="d5c4-17e0-c42a-9f43" name="Lion Cloak" 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="8165-e72e-3ca8-7852" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="065c-37f3-6620-c7c6" type="min"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="9b56-8d0a-84f3-c442" name="Lion Cloak" hidden="false" targetId="59c2-04c7-02d5-c509" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
               </selectionEntries>
               <costs>
                 <cost name="pts" typeId="points" value="0.0"/>
@@ -2508,9 +2625,9 @@
             <infoLink id="d6e2-2664-03b2-5683" name="Attuned to Magic" hidden="false" targetId="bb58-1b96-8bbd-4333" type="rule"/>
             <infoLink id="d600-5229-9881-69e8" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
             <infoLink id="7fc7-74b6-16fc-e0b2" name="Ward Save (5+)" hidden="false" targetId="4b60-6477-75a8-f6dd" type="rule"/>
-            <infoLink id="475d-2240-1e12-6e12" name="Blizzard Aura" hidden="false" targetId="4876-9e47-4f07-e87e" type="rule"/>
             <infoLink id="2030-421c-13bd-ba6c" name="Result" hidden="false" targetId="4e87-81ef-2fb0-7324" type="profile"/>
-            <infoLink id="2226-272e-b818-af7c" name="Immunity (Ice Attacks)" hidden="false" targetId="5dfb-b5c0-520b-ed68" type="rule"/>
+            <infoLink id="2226-272e-b818-af7c" name="Ice Attacks" hidden="false" targetId="fa30-0410-43da-e1d7" type="rule"/>
+            <infoLink id="34b6-0439-1bd2-d5fa" name="Immunity (Ice Attacks)" hidden="false" targetId="5dfb-b5c0-520b-ed68" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="250.0"/>
@@ -2864,7 +2981,7 @@
                 <infoLink id="10c0-97c5-234e-8cbd" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="50.0"/>
+                <cost name="pts" typeId="points" value="40.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="233d-6aa4-7cdf-0796" name="Elven Steed" hidden="false" collective="false" import="true" type="model">
@@ -2904,6 +3021,34 @@
                 <infoLink id="c780-2d81-415f-c368" name="Great Eagle" hidden="false" targetId="1ef4-a0a6-240d-c10d" type="profile"/>
                 <infoLink id="8793-c8cd-de41-02e0" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="1319-e20b-5b85-9ffa" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="211c-c179-8997-ccbd" name="Shredding Talons" 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="90d8-9e66-b144-9a4c" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="5a11-ca80-0141-762d" name="Shredding Talons" hidden="false" targetId="9e3d-1310-6e26-37de" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="bfd3-7f7c-cdfb-0378" name="Swiftsense" 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="7e59-05e7-e0a2-cf21" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="afd9-dcb7-6ae9-0925" name="Swiftsense" hidden="false" targetId="dd27-cab8-48e1-6354" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="75.0"/>
               </costs>
@@ -2952,6 +3097,18 @@
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="f80b-75c5-6619-e99d" name="Lion Cloak" 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="3b50-0540-363a-98d0" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e097-7d67-cebd-7da2" type="min"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="fa85-9467-0d42-f4b4" name="Lion Cloak" hidden="false" targetId="59c2-04c7-02d5-c509" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -3169,7 +3326,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3209,7 +3367,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3285,7 +3444,7 @@
                 <infoLink id="9e02-0ad9-aad5-7138" name="Impale" hidden="false" targetId="0eea-3c8d-ec56-3333" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="55.0"/>
+                <cost name="pts" typeId="points" value="50.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -3390,10 +3549,10 @@
                 <infoLink id="d324-6e6f-4f32-bffb" name="Attuned to Magic" hidden="false" targetId="bb58-1b96-8bbd-4333" type="rule"/>
                 <infoLink id="0ebe-be5c-ab74-99ed" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
                 <infoLink id="c20d-966e-6f3f-a33e" name="Ward Save (5+)" hidden="false" targetId="4b60-6477-75a8-f6dd" type="rule"/>
-                <infoLink id="17b0-30b1-ef9e-4f70" name="Blizzard Aura" hidden="false" targetId="4876-9e47-4f07-e87e" type="rule"/>
                 <infoLink id="12bc-e0d3-0d47-2291" name="Frostheart Phoenix" hidden="false" targetId="10ef-98c3-71a1-9693" type="profile"/>
                 <infoLink id="5303-cf51-9bc0-e943" name="Result" hidden="false" targetId="4e87-81ef-2fb0-7324" type="profile"/>
                 <infoLink id="876b-13bc-e609-31c5" name="Immunity (Ice Attacks)" hidden="false" targetId="5dfb-b5c0-520b-ed68" type="rule"/>
+                <infoLink id="8e48-352b-5aa9-c6c8" name="Ice Attacks" hidden="false" targetId="fa30-0410-43da-e1d7" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="240.0"/>
@@ -3540,7 +3699,7 @@
             </selectionEntry>
           </selectionEntries>
           <costs>
-            <cost name="pts" typeId="points" value="80.0"/>
+            <cost name="pts" typeId="points" value="85.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="c0d0-4dd4-32af-d40e" name="Shield" hidden="false" collective="false" import="true" type="upgrade">
@@ -3676,7 +3835,7 @@
       </profiles>
       <rules>
         <rule id="2479-ac57-2de9-e7f7" name="Reckless" publicationId="9e23-79cb-pubN77092" page="142" hidden="false">
-          <description>When a Dragon Mage casts a spell, a &apos;free&apos; Power dice is added to the casting attempt. This extra dice can cause a Irresistible Force or a Miscast as normal, and can cause the Dragon Mage to roll more dice than he is normally allowed to.</description>
+          <description>When a Dragon Mage casts a spell, a &apos;free&apos; Power dice is added to the casting attempt. This extra dice counts towards Ultimate Power and can cause a Miscast as normal, and allows the Dragon Mage to roll more dice than he is normally allowed to.</description>
         </rule>
         <rule id="8e28-da06-d4f6-9085" name="Warrior Mage" publicationId="9e23-79cb-pubN77092" page="142" hidden="false">
           <description>Dragon Mages get +2 to cast the spell Flaming Sword of Rhuin when targeting themselves.</description>
@@ -3768,7 +3927,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3800,7 +3960,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3904,7 +4065,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3974,7 +4136,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -4789,7 +4952,7 @@
             </selectionEntry>
           </selectionEntries>
           <costs>
-            <cost name="pts" typeId="points" value="24.0"/>
+            <cost name="pts" typeId="points" value="22.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4916,7 +5079,7 @@
                     <infoLink id="b95b-f350-70f8-f5b6" name="Ithilmar Barding" hidden="false" targetId="119e-6fba-31a3-cb8c" type="profile"/>
                   </infoLinks>
                   <costs>
-                    <cost name="pts" typeId="points" value="1.5"/>
+                    <cost name="pts" typeId="points" value="2.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -4932,7 +5095,7 @@
                 <infoLink id="4102-c725-840a-21db" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="1.5"/>
+                <cost name="pts" typeId="points" value="2.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4951,7 +5114,7 @@
                     <infoLink id="f809-fd78-9251-af8b" name="Medium Armour" hidden="false" targetId="6d9a-c9f8-e013-e77f" type="profile"/>
                   </infoLinks>
                   <costs>
-                    <cost name="pts" typeId="points" value="1.5"/>
+                    <cost name="pts" typeId="points" value="2.0"/>
                   </costs>
                 </selectionEntry>
                 <selectionEntry id="d9b7-e6a3-ca26-c480" name="Light Armour" hidden="false" collective="true" import="true" type="upgrade">
@@ -5038,7 +5201,7 @@
                 <infoLink id="a046-92c9-9e3a-bbbe" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="be95-b8e3-9e08-114e" name="Harbinger" hidden="false" collective="false" import="true" type="upgrade">
@@ -5380,6 +5543,18 @@
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="8e08-e29a-b092-91a1" name="Lion Cloak" 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="22df-7a5c-ddb2-3516" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="93b1-1dc6-ac9f-f0e8" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="27fb-707a-b92a-958c" name="Lion Cloak" hidden="false" targetId="59c2-04c7-02d5-c509" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -5575,7 +5750,7 @@
             </selectionEntry>
           </selectionEntries>
           <costs>
-            <cost name="pts" typeId="points" value="29.0"/>
+            <cost name="pts" typeId="points" value="28.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -6327,6 +6502,34 @@
             <infoLink id="30d3-45d6-42d5-4804" name="Great Eagle" hidden="false" targetId="1ef4-a0a6-240d-c10d" type="profile"/>
             <infoLink id="92af-25f6-1ac6-ff84" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
           </infoLinks>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="2b01-ebff-1398-415f" name="Upgrades" hidden="false" collective="false" import="true">
+              <selectionEntries>
+                <selectionEntry id="7930-3e1f-6e17-06e8" name="Shredding Talons" 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="153f-5078-1578-afd4" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="60c8-c989-2ec3-e65e" name="Shredding Talons" hidden="false" targetId="9e3d-1310-6e26-37de" type="rule"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="5.0"/>
+                  </costs>
+                </selectionEntry>
+                <selectionEntry id="3610-05d7-ad42-567a" name="Swiftsense" 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="cdd4-f6c4-d48b-f15f" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="74f4-86cd-326e-901b" name="Swiftsense" hidden="false" targetId="dd27-cab8-48e1-6354" type="rule"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="5.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
           <costs>
             <cost name="pts" typeId="points" value="50.0"/>
           </costs>
@@ -6435,7 +6638,7 @@
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="95.0"/>
+        <cost name="pts" typeId="points" value="100.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d6b0-e075-c1de-794d" name="Phoenix" hidden="false" collective="false" import="true" type="model">
@@ -6488,13 +6691,13 @@
                 <infoLink id="347d-908a-4570-81e8" name="Attuned to Magic" hidden="false" targetId="bb58-1b96-8bbd-4333" type="rule"/>
                 <infoLink id="2fdb-95ae-e077-9d2d" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
                 <infoLink id="9d2f-3188-6e30-d265" name="Ward Save (5+)" hidden="false" targetId="4b60-6477-75a8-f6dd" type="rule"/>
-                <infoLink id="3761-2777-af93-cfc9" name="Blizzard Aura" hidden="false" targetId="4876-9e47-4f07-e87e" type="rule"/>
                 <infoLink id="c705-3944-2ed9-223a" name="Frostheart Phoenix" hidden="false" targetId="10ef-98c3-71a1-9693" type="profile"/>
                 <infoLink id="0cf1-a32f-86ac-9bf4" name="Result" hidden="false" targetId="4e87-81ef-2fb0-7324" type="profile"/>
                 <infoLink id="b56a-4ecb-1b93-8043" name="Immunity (Ice Attacks)" hidden="false" targetId="5dfb-b5c0-520b-ed68" type="rule"/>
+                <infoLink id="b5fb-6dbb-d601-92ca" name="Ice Attacks" hidden="false" targetId="fa30-0410-43da-e1d7" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="260.0"/>
+                <cost name="pts" typeId="points" value="245.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -6847,9 +7050,6 @@
     <rule id="3e63-ad1a-583c-50b0" name="Swordmaster" publicationId="9e23-79cb-pubN77092" page="159" hidden="false">
       <description>Models with this rule ignore I penalties from great weapons and gain a Ward save (6+) against shots from all non-magical missile attacks fired at the model&apos;s front arc.</description>
     </rule>
-    <rule id="4876-9e47-4f07-e87e" name="Blizzard Aura" publicationId="9e23-79cb-pubN77092" page="177" hidden="false">
-      <description>Any enemy unit in base contact with a Frostheart Phoenix has Always Strikes Last and suffers -1 to its S (to a minimum of 1).</description>
-    </rule>
     <rule id="bb58-1b96-8bbd-4333" name="Attuned to Magic" publicationId="9e23-79cb-pubN77092" page="177" hidden="false">
       <description>When rolling to determine the strength of the Winds of Magic in the controlling player&apos;s Magic phase, compare the highest D6 rolled with the Attuned to Magic Table to determine what effects the Phoenix will have (the effect rolled will last until the start of the controlling player&apos;s next Magic phase):</description>
     </rule>
@@ -6868,7 +7068,7 @@ At the end of the game, remove all Phoenix Reborn counters from the board – th
       <description>If a Flamespyre Phoenix moves over an unengaged enemy unit in the Remaining Moves sub-phase, it suffers D6 S 4 hits with Flaming Attacks. This is a non-physical attack.</description>
     </rule>
     <rule id="0eea-3c8d-ec56-3333" name="Impale" publicationId="9e23-79cb-pubN77092" page="179" hidden="false">
-      <description>Unicorns gain Strength Bonus (1) in turns that they charge.</description>
+      <description>Unicorns gain +1 S to their Impact Hits.</description>
     </rule>
     <rule id="222e-52ff-ae92-083d" name="Fiery Breath" publicationId="9e23-79cb-pubN77092" page="148" hidden="false">
       <description>A Dragon has a S 4 Breath Weapon with Flaming Attacks.</description>
@@ -6879,6 +7079,15 @@ At the end of the game, remove all Phoenix Reborn counters from the board – th
     <rule id="4b1d-2010-d74e-666f" name="Windrider" publicationId="9e23-79cb-pubN77092" page="153" hidden="false">
       <description>A Sea Helm mounted on a Lothern Skycutter (and his Lothern Skycutter) has a 4+ ward save against shooting attacks. Furthermore, when mounted on a Lothern Skycutter, a Sea Helm re-rolls failed Dangerous Terrain tests.</description>
     </rule>
+    <rule id="dd27-cab8-48e1-6354" name="Swiftsense" publicationId="b724-d2c4-d151-2d9e" page="180" hidden="false">
+      <description>The model gains +1 I.</description>
+    </rule>
+    <rule id="b2d0-e478-58a2-0b73" name="Swooping Strike" publicationId="b724-d2c4-d151-2d9e" page="181" hidden="false">
+      <description>The model gains Devastating Charge.</description>
+    </rule>
+    <rule id="9e3d-1310-6e26-37de" name="Shredding Talons" publicationId="b724-d2c4-d151-2d9e" page="180" hidden="false">
+      <description>The model gains Armour Piercing (1).</description>
+    </rule>
   </sharedRules>
   <sharedProfiles>
     <profile id="119e-6fba-31a3-cb8c" name="Ithilmar Barding" publicationId="9e23-79cb-pubN77092" page="138" hidden="false" typeId="884c-d50e-eeb6-eda0" typeName="Armour">
@@ -6890,16 +7099,16 @@ At the end of the game, remove all Phoenix Reborn counters from the board – th
     </profile>
     <profile id="63f3-694f-b72c-b6ea" name="Elven Bow" publicationId="9e23-79cb-pubN77092" page="138" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
       <characteristics>
-        <characteristic name="Range" typeId="59f2-3142-82d5-4f43">24&quot;</characteristic>
-        <characteristic name="Strength" typeId="b80e-7dac-0dea-9add">3</characteristic>
-        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Armour Piercing (1). Volley Fire. Multiple Shots (2) (Only applies in turns the model has not moved. Cannot be used to Stand and Shoot.)</characteristic>
+        <characteristic name="Range" typeId="59f2-3142-82d5-4f43"/>
+        <characteristic name="Strength" typeId="b80e-7dac-0dea-9add"/>
+        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Elven Bows follow the rules for Bows. All shots with these weapons have Armour Piercing (1).</characteristic>
       </characteristics>
     </profile>
     <profile id="382b-9e51-5753-88bb" name="Elven Longbow" publicationId="9e23-79cb-pubN77092" page="138" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
       <characteristics>
-        <characteristic name="Range" typeId="59f2-3142-82d5-4f43">30&quot;</characteristic>
-        <characteristic name="Strength" typeId="b80e-7dac-0dea-9add">3</characteristic>
-        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Armour Piercing (1). Volley Fire. Multiple Shots (2) (Only applies in turns the model has not moved. Cannot be used to Stand and Shoot.)</characteristic>
+        <characteristic name="Range" typeId="59f2-3142-82d5-4f43"/>
+        <characteristic name="Strength" typeId="b80e-7dac-0dea-9add"/>
+        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Elven Longbows follow the rules for Longbows. All shots with these weapons have Armour Piercing (1).</characteristic>
       </characteristics>
     </profile>
     <profile id="59c2-04c7-02d5-c509" name="Lion Cloak" publicationId="9e23-79cb-pubN77092" page="161" hidden="false" typeId="884c-d50e-eeb6-eda0" typeName="Armour">
@@ -6979,7 +7188,7 @@ At the end of the game, remove all Phoenix Reborn counters from the board – th
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 4+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="3fa4-072f-d5f5-3cdd" name="Elven Steed" publicationId="9e23-79cb-pubN77092" page="179" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -7133,7 +7342,7 @@ At the end of the game, remove all Phoenix Reborn counters from the board – th
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 4+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="4544-1720-a510-78b5" name="Tiranoc Chariot" publicationId="9e23-79cb-pubN77092" page="164" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -7147,7 +7356,7 @@ At the end of the game, remove all Phoenix Reborn counters from the board – th
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 4+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="3213-303a-b2f1-261d" name="Effect" publicationId="9e23-79cb-pubN77092" page="161" hidden="false" typeId="c089-71d5-5b2f-2166" typeName="Lion Special Rules">
@@ -7187,9 +7396,9 @@ At the end of the game, remove all Phoenix Reborn counters from the board – th
     </profile>
     <profile id="172d-414b-217a-95b8" name="Bow of Avelorn" publicationId="9e23-79cb-pubN77092" page="169" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
       <characteristics>
-        <characteristic name="Range" typeId="59f2-3142-82d5-4f43">30&quot;</characteristic>
-        <characteristic name="Strength" typeId="b80e-7dac-0dea-9add">4</characteristic>
-        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Volley Fire. Flaming Attacks. Magical Attacks. Multiple Shots (2) (Only applies in turns the model does not move.)</characteristic>
+        <characteristic name="Range" typeId="59f2-3142-82d5-4f43"/>
+        <characteristic name="Strength" typeId="b80e-7dac-0dea-9add"/>
+        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Longbow. All shots with this weapon are resolved at S 4 with Armour Piercing (1) and Magical Attacks.</characteristic>
       </characteristics>
     </profile>
     <profile id="dbd6-650d-51ba-1ba0" name="Illusory Assault" publicationId="9e23-79cb-pubN77092" page="143" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
diff --git a/Hobgoblins.cat b/Hobgoblins.cat
index cc5acb3..a8cf15a 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="5" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="4" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="031d-268e-7c63-81b3" name="Hobgoblins" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="f3ee-001b-a3d8-3590" name="Treacherous Gits Table">
       <characteristicTypes>
@@ -669,7 +669,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -705,7 +706,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -932,10 +934,11 @@
               <profiles>
                 <profile id="35bc-7245-04f7-25b2" name="Shaman" publicationId="92f3-84a1-4644-bc2f" page="26" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
-                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
-                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
+                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -968,10 +971,11 @@
               <profiles>
                 <profile id="a02c-19d8-58d9-bcca" name="Shaman" publicationId="92f3-84a1-4644-bc2f" page="26" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
-                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
-                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
+                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Kingdoms_of_Ind.cat b/Kingdoms_of_Ind.cat
index 2524713..c7f3b6d 100644
--- a/Kingdoms_of_Ind.cat
+++ b/Kingdoms_of_Ind.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7180-a214-a635-1dfa" name="Kingdoms of Ind" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="7180-a214-a635-1dfa" name="Kingdoms of Ind" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="8f52-2c37-b05e-63ac" name="Maleficent Gaze Table">
       <characteristicTypes>
@@ -177,7 +177,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -793,7 +794,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -829,7 +831,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -940,7 +943,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -972,7 +976,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1004,7 +1009,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1108,7 +1114,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1140,7 +1147,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1244,7 +1252,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1276,7 +1285,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1840,7 +1850,8 @@ If their Beastmaster is killed, any unengaged animals will immediately flee the
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1876,7 +1887,8 @@ If their Beastmaster is killed, any unengaged animals will immediately flee the
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Kislev.cat b/Kislev.cat
index 788119f..77b86fe 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="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="443d-406a-91b3-9788" name="Kislev" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="9fbd-5eb3-4c58-bce4" name="Drunken Stupor Table">
       <characteristicTypes>
@@ -224,7 +224,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -482,7 +483,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -613,7 +615,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1090,7 +1093,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1122,7 +1126,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1226,7 +1231,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1258,7 +1264,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2066,7 +2073,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2098,7 +2106,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2201,7 +2210,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2233,7 +2243,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Lizardmen.cat b/Lizardmen.cat
index 2b998f2..22d1e0d 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="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="7" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="199b-5495-f6b6-fe0f" name="Lizardmen" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="8f38-4096-41a1-bd68" name="Discipline of the Old Ones">
       <characteristicTypes>
@@ -88,7 +88,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -337,7 +338,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -722,7 +724,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -792,7 +795,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -862,7 +866,7 @@
         <selectionEntry id="7d2c-f3e2-9dac-4a10" name="Disciplines of the Old Ones" 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="3e95-5296-c3e8-8f5b" type="max"/>
-            <constraint field="points" scope="parent" value="150.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="0dee-1f33-519f-0f10" type="max"/>
+            <constraint field="points" scope="parent" value="100.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="0dee-1f33-519f-0f10" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="11f8-8183-52e6-a0e3" name="Disciplines of the Old Ones" hidden="false" collective="false" import="true" targetId="9116-e3d7-5fb1-32dd" type="selectionEntryGroup"/>
@@ -1444,6 +1448,7 @@
         <infoLink id="0dd7-017c-2c9e-5b58" name="Cold-Blooded" hidden="false" targetId="eb46-96d2-9469-4905" type="rule"/>
         <infoLink id="165a-1c50-e529-a175" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
         <infoLink id="fd19-c091-3cbf-96ff" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
+        <infoLink id="6164-253b-1648-8633" name="Predatory Fighters" hidden="false" targetId="096e-8f90-c156-f63d" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="c18f-91a1-b7cc-12a7" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
@@ -1564,10 +1569,13 @@
           <profiles>
             <profile id="013f-8312-d0ea-7a7c" name="The Stellar Staff" publicationId="9e23-79cb-pubN77402" page="183" hidden="false" typeId="24d7-7f7d-a4d7-c26c" typeName="Arcane Item">
               <characteristics>
-                <characteristic name="Special Rules" typeId="3df8-4ab0-c4bd-e2ad">If Tetto&apos;eko successfully casts the spell Comet of Casandora, you may re-roll the dice at the start of each Magic phase to see if the comet arrives.</characteristic>
+                <characteristic name="Special Rules" typeId="3df8-4ab0-c4bd-e2ad">Tetto&apos;eko knows the Comet of Casandora spells from the Lore of Heavens. If he successfully casts it, you may re-roll the dice at the start of each Magic phase to see if the comet arrives.</characteristic>
               </characteristics>
             </profile>
           </profiles>
+          <infoLinks>
+            <infoLink id="beba-ba2f-7db4-999b" name="Comet of Casandora" hidden="false" targetId="d667-970a-a36d-c1de" type="profile"/>
+          </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
@@ -1583,7 +1591,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -2875,7 +2884,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2911,7 +2921,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -5593,7 +5604,7 @@ Casualties are always taken from the rearmost rank of the appropriate model type
                 <infoLink id="b636-1e96-29a0-6465" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="ba83-717b-0b47-8c9b" name="Great Crested Brave" hidden="false" collective="false" import="true" type="upgrade">
diff --git a/Magic.cat b/Magic.cat
index 90f7a92..5d23439 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="6" 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|https://discordapp.com/invite/UrrPB3T" library="true" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="a579-d41f-e1ad-746f" name="Magic" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="true" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="7" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="9965-cb44-b099-6e8f" name="Foot of Gork Table">
       <characteristicTypes>
@@ -7521,7 +7521,7 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d063-0830-06c2-1152" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="9a3d-4692-46bc-612f" name="1. Bonecrusher" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="9a3d-4692-46bc-612f" name="2. Bonecrusher" 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="fba7-0fc1-1d96-65ef" type="max"/>
               </constraints>
@@ -7543,7 +7543,7 @@
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="e6c3-4704-58f8-f1d7" name="2. Bullgorger" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="e6c3-4704-58f8-f1d7" name="1. Bullgorger" 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="6a39-46cb-921f-a1a6" type="max"/>
               </constraints>
@@ -7598,7 +7598,7 @@
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b744-2071-c16e-9ca2" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="0dda-aa9f-9b48-3d91" name="1. Bonecrusher" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="0dda-aa9f-9b48-3d91" name="2. Bonecrusher" 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="0fde-7af0-f00d-4b75" type="max"/>
               </constraints>
@@ -7631,7 +7631,7 @@
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="1e72-0914-c49a-5af7" name="2. Bullgorger" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="1e72-0914-c49a-5af7" name="1. Bullgorger" 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="ed65-1de7-145f-9abe" type="max"/>
               </constraints>
@@ -7686,7 +7686,7 @@
             <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aabc-6a43-cbeb-1cb0" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="4e01-c76d-e087-0dc5" name="1. Bonecrusher" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="4e01-c76d-e087-0dc5" name="2. Bonecrusher" 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="0689-a41a-4279-15cb" type="max"/>
               </constraints>
@@ -7730,7 +7730,7 @@
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="48d2-f069-17eb-4403" name="2. Bullgorger" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="48d2-f069-17eb-4403" name="1. Bullgorger" 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="df88-df24-4193-1cb8" type="max"/>
               </constraints>
@@ -7785,7 +7785,7 @@
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3e52-844f-c54e-36c0" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="29fa-1d44-2fe2-6961" name="1. Bonecrusher" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="29fa-1d44-2fe2-6961" name="2. Bonecrusher" 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="a0ae-e505-f207-61db" type="max"/>
               </constraints>
@@ -7840,7 +7840,7 @@
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="15d2-42c6-c7d6-08d6" name="2. Bullgorger" hidden="false" collective="false" import="true" type="upgrade">
+            <selectionEntry id="15d2-42c6-c7d6-08d6" name="1. Bullgorger" 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="90d8-7170-9b97-a10f" type="max"/>
               </constraints>
@@ -7887,7 +7887,7 @@
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="3ebf-5e60-0f70-eda1" name="1. Bonecrusher" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="3ebf-5e60-0f70-eda1" name="2. Bonecrusher" 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="3af0-c4c1-4ab8-54c4" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="54e6-0403-dc02-cd10" type="min"/>
@@ -7899,7 +7899,7 @@
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="98bd-38f7-fdc7-9601" name="2. Bullgorger" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="98bd-38f7-fdc7-9601" name="1. Bullgorger" 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="a6ec-964e-6772-d92f" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d4c8-b6f9-d8ef-96b2" type="min"/>
@@ -27059,7 +27059,8 @@
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Direct Damage</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">13+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">24&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Targets a single enemy character (even if in a unit). The target suffers a single Wound which Ignores Armour saves on a dice roll greater than or equal to the model&apos;s unmodified armour save (models without an armour save cannot be wounded). The owning player must then reveal to the caster all the magic items possessed by the target. If the target has one or more magic items, randomly select one of them – that item is immediately destroyed on the roll of 2+ and cannot be used for the rest of the game. Note that this spell has no effect on magic items that are mounts, magic items that contain bound spells that have miscast during the game, and any magic items labelled as &apos;one use only&apos; that have already been used during the game – do not include these when randomly selecting a magic item.</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Targets a single enemy character (even if in a unit). The target suffers a single Wound which Ignores Armour saves on a dice roll greater than or equal to the model&apos;s unmodified armour save (excluding Natural Armour, models without an armour save cannot be wounded). The owning player must then reveal to the caster all the magic items possessed by the target (if any). If the target has one or more magic items, randomly select one of them – that item is immediately destroyed on the roll of 2+ and cannot be used for the rest of the game. Note that this spell has no effect on magic items
+that are mounts, magic items that contain bound spells that have miscast during the game, and any magic items labelled as &apos;one use only&apos; that have already been used during the game – do not include these when randomly selecting a magic item.</characteristic>
       </characteristics>
     </profile>
     <profile id="76b3-39db-a4a7-e39c" name="Fiery Convocation" publicationId="b724-d2c4-d151-2d9e" page="201, 189" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
@@ -27100,7 +27101,7 @@
     </profile>
     <profile id="6cf9-b4a5-0324-10df" name="Bonecrusher" publicationId="9e23-79cb-pubN78137" page="113" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
       <characteristics>
-        <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">1</characteristic>
+        <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">2</characteristic>
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b"> Magic Missile</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">8+/11+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">18&quot;/36&quot;</characteristic>
@@ -27109,7 +27110,7 @@
     </profile>
     <profile id="b693-5826-24a6-e6d8" name="Bullgorger" publicationId="9e23-79cb-pubN78137" page="113" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
       <characteristics>
-        <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">2</characteristic>
+        <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">1</characteristic>
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">7+/14+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">12&quot;/12&quot;</characteristic>
@@ -27149,7 +27150,11 @@
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Direct Damage</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">15+/21+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">18&quot;/18&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Place the small/large round template anywhere within range of the caster. Roll the artillery dice and the scatter dice. Unless a Hit! is rolled, move the template the distance shown on the artillery dice, in the direction shown on the scatter dice. If a misfire is rolled, the opposing player picks up the template and repositions it anywhere on the battlefield. The artillery dice and scatter dice are then rolled again to see if the template scatters from the new target point (re-roll any further misfires until a result other than a misfire is rolled). Once the final position of the template is determined, all models under the template must take an I test. Models that pass the test suffer a S 3 hit. Models that fail the test suffer a S 7 hit with Multiple Wounds (D6).</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Place the small/large round template anywhere within 18&quot; of the caster. Roll the artillery dice and the scatter dice. Unless a Hit! is rolled, move the template the distance shown on the artillery dice, in the direction shown on the scatter dice.
+
+If a misfire is rolled, centre the template on the caster and roll a scatter dice and a D6. The template moves the number of inches equal to the result of the D6, in the direction shown on the scatter dice (if you roll a Hit!, use the little arrow shown on the Hit! symbol).
+
+Once the final position of the template is determined, all models under the template must take an I test. Models that pass the test suffer a S 3 hit. Models that fail the test suffer a S 7 hit with Multiple Wounds (D6).</characteristic>
       </characteristics>
     </profile>
     <profile id="aa49-eb59-303e-6402" name="Gaze of Mork" publicationId="9e23-79cb-pubN78975" page="199" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
@@ -27371,7 +27376,7 @@ Ignores Armour Saves. The type of characteristic test is determined by rolling o
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Direct Damage</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">13+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">4D6&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Trace a straight line from the base of the caster the number of inches rolled. All models in its path must pass an I test or be removed as casualties with no saves of any kind allowed. Instead of taking an I test, War Machines and Chariots must instead roll a 5+ or be destroyed. A building (or single section of a multi-part building) affected by the spell will collapse on a roll of 5+. If the building collapses, any models garrisoning it must pass an I test, or be removed as a casualty with no armour save allowed. Any survivors are placed outside the building, as described for a unit abandoning a building. Then replace the building with an area of dangerous terrain of equal size.</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Trace a straight line from the base of the caster the number of inches rolled. All models in its path must pass an I test or be removed as casualties with no saves except Magic Resistance allowed. Instead of taking an I test, War Machines and Chariots must instead roll a 5+ or be destroyed. A building (or single section of a multi-part building) affected by the spell will collapse on a roll of 5+. If the building collapses, any models garrisoning it must pass an I test, or be removed as a casualty with no armour save allowed. Any survivors are placed outside the building, as described for a unit abandoning a building. Then replace the building with an area of dangerous terrain of equal size.</characteristic>
       </characteristics>
     </profile>
     <profile id="83fc-bbab-f010-cbb0" name="Curse of the Horned Rat" publicationId="4086-1ccd-f433-39a2" page="154" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
@@ -27955,7 +27960,7 @@ If there is at least one unit (friendly or enemy) within the forest, then the fo
         <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">4</characteristic>
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b"/>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">9+</characteristic>
-        <characteristic name="Range" typeId="2954-76ea-decb-30ff">24&quot;</characteristic>
+        <characteristic name="Range" typeId="2954-76ea-decb-30ff">12&quot;</characteristic>
         <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Place a mysterious forest no more than 12&quot; in diameter within the spell’s maximum range. Any models under this forest are placed within them (in exactly the same formation and facing).</characteristic>
       </characteristics>
     </profile>
@@ -29191,7 +29196,7 @@ Moves phase.</characteristic>
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Hex</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">9+/11+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">24&quot;/48&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">The target unit will fail any unmodified To Hit rolls (in shooting and close combat) and armour saves on both a 1 and 2 until the start of the caster&apos;s next Magic phase.</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">The target unit must re-roll successful To Hit rolls (in shooting and close combat) and armour saves until the start of the caster&apos;s next Magic phase.</characteristic>
       </characteristics>
     </profile>
     <profile id="Sneaky Stealin&apos; (Bad Moon)" name="Sneaky Stealin&apos;" publicationId="9e23-79cb-pubN78975" page="202" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
@@ -29263,7 +29268,7 @@ Moves phase.</characteristic>
         <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
         <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">6+/14+</characteristic>
         <characteristic name="Range" typeId="2954-76ea-decb-30ff">24&quot;/12&quot;</characteristic>
-        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Can be cast on an Infantry unit. The target unit ignores Dangerous and Impassable Terrain (note that it may not end its move within 1&quot; of it as normal) until the start of the caster&apos;s next turn. Boosted version affects all friendly units within range.</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Can be cast on an Infantry unit. The target unit ignores Dangerous and Impassable Terrain (note that it may not end its move within 1&quot; of it as normal) until the start of the caster&apos;s next Magic phase. Boosted version affects all friendly units within range.</characteristic>
       </characteristics>
     </profile>
     <profile id="42e3-25f5-785a-a322" name="Armour of Darkness" publicationId="4086-1ccd-f433-39a2" page="227" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
diff --git a/Nippon.cat b/Nippon.cat
index 2d6b220..9f8becf 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="4" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="3" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="e275-bf7b-24ea-92f1" name="Nippon" revision="5" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="9854-e1a2-2d5c-9b43" name="Duelling Techniques">
       <characteristicTypes>
@@ -199,7 +199,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -544,7 +545,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -580,7 +582,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1266,7 +1269,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1302,7 +1306,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Norse.cat b/Norse.cat
index f4d3842..77990c1 100644
--- a/Norse.cat
+++ b/Norse.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b7f1-0dfa-b690-b138" name="Norse" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b7f1-0dfa-b690-b138" name="Norse" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="1507-81b3-767a-5985" name="Skald Songs and Stories">
       <characteristicTypes>
@@ -166,7 +166,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -686,7 +687,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -723,7 +725,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1427,7 +1430,8 @@ In addition, roll a D6 at beginning of the Norse turn. On a roll of a 6 the Rave
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1464,7 +1468,8 @@ In addition, roll a D6 at beginning of the Norse turn. On a roll of a 6 the Rave
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Ogre_Kingdoms.cat b/Ogre_Kingdoms.cat
index 3f1136c..c9d2156 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="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="e12f-c1a5-402a-77ae" name="Ogre Kingdoms" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="dcfb-308c-d238-54ac" name="Big Name">
       <characteristicTypes>
@@ -274,7 +274,8 @@ and Multiple Wounds (D3).</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
               </characteristics>
             </profile>
           </profiles>
@@ -488,7 +489,8 @@ and Multiple Wounds (D3).</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -611,22 +613,7 @@ and Multiple Wounds (D3).</characteristic>
         <categoryLink id="5669-a58f-c785-e648" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="false"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="e787-dded-8989-56ae" name="Magic Items" 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="b589-5836-1b5b-4f97" type="max"/>
-            <constraint field="points" scope="parent" value="100.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b8c8-69ac-550d-b9db" type="max"/>
-          </constraints>
-          <entryLinks>
-            <entryLink id="8946-dd85-f5f7-5934" name="Enchanted Items" hidden="false" collective="false" import="true" targetId="e620-3ace-2026-56b2" type="selectionEntryGroup"/>
-            <entryLink id="817f-75f6-8699-4cd2" name="Talismans" hidden="false" collective="false" import="true" targetId="946f-a470-9912-9301" type="selectionEntryGroup"/>
-            <entryLink id="b71a-1e4e-9d6d-147b" name="Magic Weapons" hidden="false" collective="false" import="true" targetId="f9f8-08c0-190e-938e" type="selectionEntryGroup"/>
-            <entryLink id="21f4-04d8-7b46-de25" name="Magic Armour" hidden="false" collective="false" import="true" targetId="a427-308b-073b-890e" type="selectionEntryGroup"/>
-          </entryLinks>
-          <costs>
-            <cost name="pts" typeId="points" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="7ca1-efe5-e82b-b7eb" name="Big Names" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="7ca1-efe5-e82b-b7eb" name="Big Names &amp; Magic Items" hidden="false" collective="false" import="true" type="upgrade">
           <modifiers>
             <modifier type="increment" field="2135-8430-971a-03fc" value="15">
               <repeats>
@@ -636,10 +623,14 @@ and Multiple Wounds (D3).</characteristic>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0ed6-0447-987b-5316" type="max"/>
-            <constraint field="points" scope="parent" value="50.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="2135-8430-971a-03fc" type="max"/>
+            <constraint field="points" scope="parent" value="100.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="2135-8430-971a-03fc" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="8d61-1989-a192-c6f8" name="Big Names" hidden="false" collective="false" import="true" targetId="b940-f3aa-fc1c-905a" type="selectionEntryGroup"/>
+            <entryLink id="c6ae-34a1-52fd-7955" name="Enchanted Items" hidden="false" collective="false" import="true" targetId="e620-3ace-2026-56b2" type="selectionEntryGroup"/>
+            <entryLink id="98d8-ecd3-7c00-010b" name="Magic Armour" hidden="false" collective="false" import="true" targetId="a427-308b-073b-890e" type="selectionEntryGroup"/>
+            <entryLink id="bdf5-c4d0-ac6c-2913" name="Magic Weapons" hidden="false" collective="false" import="true" targetId="f9f8-08c0-190e-938e" type="selectionEntryGroup"/>
+            <entryLink id="dc21-bd71-5955-ea68" name="Talismans" hidden="false" collective="false" import="true" targetId="946f-a470-9912-9301" type="selectionEntryGroup"/>
           </entryLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -827,7 +818,7 @@ and Multiple Wounds (D3).</characteristic>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6d88-0410-d05b-f5ac" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="5e0c-982d-198e-8abe" name="Impact Hits (D6+2)" hidden="false" targetId="d078-4dd8-8ffb-876a" type="rule"/>
+                <infoLink id="5e0c-982d-198e-8abe" name="Impact Hits (D6)" hidden="false" targetId="e9e6-66cc-623f-8e94" type="rule"/>
                 <infoLink id="a1b7-c24c-8bc2-d689" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="70c8-01f4-45b4-5b7e" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
                 <infoLink id="b8d5-4838-017c-212e" name="Rhinox War Chariot" hidden="false" targetId="17f0-326b-1d42-a423" type="profile"/>
@@ -840,6 +831,7 @@ and Multiple Wounds (D3).</characteristic>
                   </constraints>
                   <infoLinks>
                     <infoLink id="890d-5e65-54a6-863d" name="Rhinox" hidden="false" targetId="fc1f-f1f3-119e-63ec" type="profile"/>
+                    <infoLink id="125b-a402-68d8-6472" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
                   </infoLinks>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -998,18 +990,6 @@ and Multiple Wounds (D3).</characteristic>
                 <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="f6d7-5569-8df5-2635" name="Hand Weapon &amp; Ironfist" 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="6d41-9609-6b49-f745" type="max"/>
-              </constraints>
-              <infoLinks>
-                <infoLink id="f39a-9b00-ece8-5b6a" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
-                <infoLink id="fd0b-cd77-7de7-41aa" name="Ironfist" hidden="false" targetId="6762-6a5b-4d19-dc9f" type="profile"/>
-              </infoLinks>
-              <costs>
-                <cost name="pts" typeId="points" value="6.0"/>
-              </costs>
-            </selectionEntry>
           </selectionEntries>
         </selectionEntryGroup>
         <selectionEntryGroup id="aeb9-2d3c-f85a-0a73" name="Gnoblars" hidden="false" collective="false" import="true">
@@ -1054,7 +1034,8 @@ and Multiple Wounds (D3).</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1089,7 +1070,8 @@ and Multiple Wounds (D3).</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1502,6 +1484,7 @@ and Multiple Wounds (D3).</characteristic>
                 <infoLink id="c58a-afaf-5bff-4f6a" name="Mournfang" hidden="false" targetId="f151-300b-a2da-39f5" type="profile"/>
                 <infoLink id="dbd0-c97a-2065-3f46" name="Impact Hits (D3)" hidden="false" targetId="f30d-0b61-2836-689e" type="rule"/>
                 <infoLink id="96bd-6538-15ab-ead2" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
+                <infoLink id="f712-9485-4cb4-2531" name="Jhared the Red" hidden="false" targetId="cde9-e208-3420-4544" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="45.0"/>
@@ -1516,6 +1499,7 @@ and Multiple Wounds (D3).</characteristic>
                 <infoLink id="64b2-01fc-d76c-b14b" name="Impact Hits (D3)" hidden="false" targetId="f30d-0b61-2836-689e" type="rule"/>
                 <infoLink id="7602-688e-4fdc-b6a8" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
                 <infoLink id="e824-7ce5-da13-7c10" name="Frenzy" hidden="false" targetId="9ff3-dda6-e142-5a77" type="rule"/>
+                <infoLink id="750c-aa32-873a-9580" name="Jhared the Red" hidden="false" targetId="cde9-e208-3420-4544" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="65.0"/>
@@ -1535,6 +1519,7 @@ and Multiple Wounds (D3).</characteristic>
                 <infoLink id="044f-f829-6c88-e64a" name="Stone Skeleton" hidden="false" targetId="c65c-f846-aec9-4814" type="rule"/>
                 <infoLink id="3ffb-66d5-3bd4-708d" name="Natural Armour (4+)" hidden="false" targetId="6b43-9dda-f589-0509" type="rule"/>
                 <infoLink id="c0bb-d8e9-eead-8b42" name="Frenzy" hidden="false" targetId="9ff3-dda6-e142-5a77" type="rule"/>
+                <infoLink id="c103-2829-c4fd-5b41" name="Jhared the Red" hidden="false" targetId="cde9-e208-3420-4544" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="225.0"/>
@@ -1553,7 +1538,8 @@ and Multiple Wounds (D3).</characteristic>
                 <infoLink id="2910-effd-44d1-793b" name="Stomp" hidden="false" targetId="668c-19e8-b764-8549" type="rule"/>
                 <infoLink id="6c11-a7f9-6adf-7ad3" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
                 <infoLink id="4c37-5743-ec05-be4c" name="Sphere of Frost-wreathed Ice" hidden="false" targetId="9014-b156-9887-ed88" type="profile"/>
-                <infoLink id="7005-6060-516e-14fd" name="Ice Attacks" hidden="false" targetId="fa30-0410-43da-e1d7" type="rule"/>
+                <infoLink id="7005-6060-516e-14fd" name="Jhared the Red" hidden="false" targetId="cde9-e208-3420-4544" type="rule"/>
+                <infoLink id="cf9a-1af5-c4c5-82af" name="Ice Attacks" hidden="false" targetId="fa30-0410-43da-e1d7" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="225.0"/>
@@ -1595,42 +1581,29 @@ and Multiple Wounds (D3).</characteristic>
         <categoryLink id="d8f4-a91c-d4fc-2551" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="2c07-af81-7bef-b7f6" name="Magic Items" hidden="false" collective="false" import="true" type="upgrade">
-          <modifiers>
-            <modifier type="set" field="2804-c8d5-a599-3857" value="0">
-              <conditions>
-                <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bb31-0258-90d2-36d1" type="atLeast"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2804-c8d5-a599-3857" type="max"/>
-            <constraint field="points" scope="parent" value="50.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8e1a-f2a2-113c-a637" type="max"/>
-          </constraints>
-          <entryLinks>
-            <entryLink id="f1e1-161f-39cc-279a" name="Enchanted Items" hidden="false" collective="false" import="true" targetId="e620-3ace-2026-56b2" type="selectionEntryGroup"/>
-            <entryLink id="5925-11ff-417d-c2e5" name="Magic Weapons" hidden="false" collective="false" import="true" targetId="f9f8-08c0-190e-938e" type="selectionEntryGroup"/>
-            <entryLink id="cd65-c9b0-aa2a-3e2e" name="Magic Armour" hidden="false" collective="false" import="true" targetId="a427-308b-073b-890e" type="selectionEntryGroup"/>
-            <entryLink id="d14c-9515-beae-05fe" name="Talismans" hidden="false" collective="false" import="true" targetId="946f-a470-9912-9301" type="selectionEntryGroup"/>
-          </entryLinks>
-          <costs>
-            <cost name="pts" typeId="points" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="5417-4592-b3bb-771f" name="Big Names" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="5417-4592-b3bb-771f" name="Big Names &amp; Magic Items" hidden="false" collective="false" import="true" type="upgrade">
           <modifiers>
             <modifier type="increment" field="b3a8-78f9-b12e-ac7a" value="15">
               <repeats>
                 <repeat field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="54fd-36d6-8f47-cbd9" repeats="1" roundUp="false"/>
               </repeats>
             </modifier>
+            <modifier type="set" field="16f2-6fc5-957a-febc" value="0.0">
+              <conditions>
+                <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bb31-0258-90d2-36d1" type="atLeast"/>
+              </conditions>
+            </modifier>
           </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="16f2-6fc5-957a-febc" type="max"/>
-            <constraint field="points" scope="parent" value="25.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b3a8-78f9-b12e-ac7a" type="max"/>
+            <constraint field="points" scope="parent" value="50.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b3a8-78f9-b12e-ac7a" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="e87a-0420-0fba-69cf" name="Big Names" hidden="false" collective="false" import="true" targetId="b940-f3aa-fc1c-905a" type="selectionEntryGroup"/>
+            <entryLink id="6493-caf0-0fcf-0a72" name="Enchanted Items" hidden="false" collective="false" import="true" targetId="e620-3ace-2026-56b2" type="selectionEntryGroup"/>
+            <entryLink id="d7ba-2734-8c33-d224" name="Magic Armour" hidden="false" collective="false" import="true" targetId="a427-308b-073b-890e" type="selectionEntryGroup"/>
+            <entryLink id="9c95-6323-2364-2d02" name="Magic Weapons" hidden="false" collective="false" import="true" targetId="f9f8-08c0-190e-938e" type="selectionEntryGroup"/>
+            <entryLink id="eec3-31ac-f6d1-c0ce" name="Talismans" hidden="false" collective="false" import="true" targetId="946f-a470-9912-9301" type="selectionEntryGroup"/>
           </entryLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -1818,7 +1791,7 @@ and Multiple Wounds (D3).</characteristic>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="92af-fab8-2022-6fbb" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="d1d1-dc2f-7da9-db8e" name="Impact Hits (D6+2)" hidden="false" targetId="d078-4dd8-8ffb-876a" type="rule"/>
+                <infoLink id="d1d1-dc2f-7da9-db8e" name="Impact Hits (D6)" hidden="false" targetId="e9e6-66cc-623f-8e94" type="rule"/>
                 <infoLink id="f966-a800-ca5d-5657" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="e279-cdd0-361c-79ee" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
                 <infoLink id="e59b-e4f4-f902-2e12" name="Rhinox War Chariot" hidden="false" targetId="17f0-326b-1d42-a423" type="profile"/>
@@ -1831,6 +1804,7 @@ and Multiple Wounds (D3).</characteristic>
                   </constraints>
                   <infoLinks>
                     <infoLink id="90e1-0c49-b811-1ad3" name="Rhinox" hidden="false" targetId="fc1f-f1f3-119e-63ec" type="profile"/>
+                    <infoLink id="9273-50ef-5c78-643f" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
                   </infoLinks>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -1861,7 +1835,7 @@ and Multiple Wounds (D3).</characteristic>
                   <modifiers>
                     <modifier type="set" field="6fd8-71af-1336-6635" value="0">
                       <conditions>
-                        <condition field="selections" scope="16bd-cf4e-7102-c09f" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2c07-af81-7bef-b7f6" type="atLeast"/>
+                        <condition field="selections" scope="16bd-cf4e-7102-c09f" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5417-4592-b3bb-771f" type="atLeast"/>
                       </conditions>
                     </modifier>
                   </modifiers>
@@ -2015,18 +1989,6 @@ and Multiple Wounds (D3).</characteristic>
                 <cost name="pts" typeId="points" value="4.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="0abc-1138-d5e3-2235" name="Hand Weapon &amp; Ironfist" 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="ba01-4903-51d8-0217" type="max"/>
-              </constraints>
-              <infoLinks>
-                <infoLink id="b227-d62e-52e1-8f74" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
-                <infoLink id="0461-b573-90d0-4aa1" name="Ironfist" hidden="false" targetId="6762-6a5b-4d19-dc9f" type="profile"/>
-              </infoLinks>
-              <costs>
-                <cost name="pts" typeId="points" value="5.0"/>
-              </costs>
-            </selectionEntry>
           </selectionEntries>
         </selectionEntryGroup>
         <selectionEntryGroup id="3640-4940-be1f-d96a" name="Gnoblars" hidden="false" collective="false" import="true">
@@ -2068,10 +2030,11 @@ and Multiple Wounds (D3).</characteristic>
               <profiles>
                 <profile id="fbf6-f3d1-179e-aa4d" name="Butcher" publicationId="9e23-79cb-pubN78137" page="61" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
-                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
-                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
+                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2103,10 +2066,11 @@ and Multiple Wounds (D3).</characteristic>
               <profiles>
                 <profile id="694c-f681-8275-15a9" name="Butcher" publicationId="9e23-79cb-pubN78137" page="61" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
-                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
-                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
+                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2169,28 +2133,17 @@ and Multiple Wounds (D3).</characteristic>
         <categoryLink id="29c6-43b8-0489-4bd1" name="Heroes" hidden="false" targetId="d38a-73da-883b-bab9" primary="true"/>
       </categoryLinks>
       <selectionEntries>
-        <selectionEntry id="9271-53f9-d9f9-7ee5" name="Magic Items" 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="d646-e169-0777-56c1" type="max"/>
-            <constraint field="points" scope="parent" value="50.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="dd24-749f-601e-65a4" type="max"/>
-          </constraints>
-          <entryLinks>
-            <entryLink id="d119-8677-8b96-7dbd" name="Enchanted Items" hidden="false" collective="false" import="true" targetId="e620-3ace-2026-56b2" type="selectionEntryGroup"/>
-            <entryLink id="a36a-2335-b312-7048" name="Magic Weapons" hidden="false" collective="false" import="true" targetId="f9f8-08c0-190e-938e" type="selectionEntryGroup"/>
-            <entryLink id="3199-812e-0a57-fc50" name="Magic Armour" hidden="false" collective="false" import="true" targetId="a427-308b-073b-890e" type="selectionEntryGroup"/>
-            <entryLink id="c99b-2466-3d2d-879b" name="Talismans" hidden="false" collective="false" import="true" targetId="946f-a470-9912-9301" type="selectionEntryGroup"/>
-          </entryLinks>
-          <costs>
-            <cost name="pts" typeId="points" value="0.0"/>
-          </costs>
-        </selectionEntry>
-        <selectionEntry id="c1fd-f202-464e-09a0" name="Big Names" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="c1fd-f202-464e-09a0" name="Big Names &amp; Magic Items" 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="a7ff-122a-68f3-650c" type="max"/>
-            <constraint field="points" scope="parent" value="25.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8d07-e8b2-41e1-6b21" type="max"/>
+            <constraint field="points" scope="parent" value="50.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8d07-e8b2-41e1-6b21" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="49f6-973b-8b46-55e5" name="Big Names" hidden="false" collective="false" import="true" targetId="b940-f3aa-fc1c-905a" type="selectionEntryGroup"/>
+            <entryLink id="a372-b149-f457-4be6" name="Enchanted Items" hidden="false" collective="false" import="true" targetId="e620-3ace-2026-56b2" type="selectionEntryGroup"/>
+            <entryLink id="ba68-5d31-f471-8473" name="Magic Armour" hidden="false" collective="false" import="true" targetId="a427-308b-073b-890e" type="selectionEntryGroup"/>
+            <entryLink id="8016-63f7-6fbe-84a1" name="Magic Weapons" hidden="false" collective="false" import="true" targetId="f9f8-08c0-190e-938e" type="selectionEntryGroup"/>
+            <entryLink id="f631-8eb8-d11a-7331" name="Talismans" hidden="false" collective="false" import="true" targetId="946f-a470-9912-9301" type="selectionEntryGroup"/>
           </entryLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -2269,6 +2222,7 @@ and Multiple Wounds (D3).</characteristic>
                 <infoLink id="7ce8-5a44-11a4-aa79" name="Stone Skeleton" hidden="false" targetId="c65c-f846-aec9-4814" type="rule"/>
                 <infoLink id="0dc7-efaa-9f64-7073" name="Natural Armour (4+)" hidden="false" targetId="6b43-9dda-f589-0509" type="rule"/>
                 <infoLink id="2786-9ba2-9ae3-855b" name="Frenzy" hidden="false" targetId="9ff3-dda6-e142-5a77" type="rule"/>
+                <infoLink id="84fb-99f5-a143-46d9" name="Hunter" hidden="false" targetId="1473-ae44-e14c-a3cd" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="225.0"/>
@@ -2288,6 +2242,7 @@ and Multiple Wounds (D3).</characteristic>
                 <infoLink id="95b2-382a-27c3-be08" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
                 <infoLink id="f6a6-cc37-0926-43f5" name="Sphere of Frost-wreathed Ice" hidden="false" targetId="9014-b156-9887-ed88" type="profile"/>
                 <infoLink id="6ba9-45f5-5eed-3b40" name="Ice Attacks" hidden="false" targetId="fa30-0410-43da-e1d7" type="rule"/>
+                <infoLink id="2548-5ca2-0c90-ec5f" name="Hunter" hidden="false" targetId="1473-ae44-e14c-a3cd" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="225.0"/>
@@ -2463,10 +2418,11 @@ and Multiple Wounds (D3).</characteristic>
               <profiles>
                 <profile id="7067-d1ca-4011-da64" name="Firebelly" publicationId="9e23-79cb-pubN78137" page="62" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
-                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
-                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
+                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2495,10 +2451,11 @@ and Multiple Wounds (D3).</characteristic>
               <profiles>
                 <profile id="8f81-0595-7a23-f747" name="Firebelly" publicationId="9e23-79cb-pubN78137" page="62" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
-                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
-                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
+                    <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3272,7 +3229,8 @@ and Multiple Wounds (D3).</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -3371,7 +3329,7 @@ and Multiple Wounds (D3).</characteristic>
             </selectionEntry>
           </selectionEntries>
           <costs>
-            <cost name="pts" typeId="points" value="43.0"/>
+            <cost name="pts" typeId="points" value="40.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3690,18 +3648,6 @@ and Multiple Wounds (D3).</characteristic>
                     <cost name="pts" typeId="points" value="6.0"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="c009-1520-c3bc-93cd" name="Hand Weapon &amp; 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="aea0-aade-cecd-da8b" type="max"/>
-                  </constraints>
-                  <infoLinks>
-                    <infoLink id="6b64-ddf8-f265-5246" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
-                    <infoLink id="30a2-4e6b-73d7-8019" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
-                  </infoLinks>
-                  <costs>
-                    <cost name="pts" typeId="points" value="3.0"/>
-                  </costs>
-                </selectionEntry>
                 <selectionEntry id="201a-d080-a6a8-b1b6" name="Hand Weapon &amp; Ironfist" 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="f9a1-e6ab-31d8-2231" type="max"/>
@@ -3964,18 +3910,6 @@ and Multiple Wounds (D3).</characteristic>
                     <cost name="pts" typeId="points" value="6.0"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="bbdd-a382-2cfe-5113" name="Hand Weapon &amp; 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="1313-3e31-270b-e983" type="max"/>
-                  </constraints>
-                  <infoLinks>
-                    <infoLink id="7e77-c031-88dc-54f5" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
-                    <infoLink id="5f75-7db7-126f-0c89" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
-                  </infoLinks>
-                  <costs>
-                    <cost name="pts" typeId="points" value="3.0"/>
-                  </costs>
-                </selectionEntry>
                 <selectionEntry id="a68d-c457-11e3-becb" name="Hand Weapon &amp; Ironfist" 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="1921-3900-d66d-e30d" type="max"/>
@@ -4324,7 +4258,7 @@ and Multiple Wounds (D3).</characteristic>
     </selectionEntry>
     <selectionEntry id="29da-3473-5c68-f206" name="Rhinox War Chariot" hidden="false" collective="false" import="true" type="model">
       <infoLinks>
-        <infoLink id="2fc0-4117-8ced-f664" name="Impact Hits (D6+2)" hidden="false" targetId="d078-4dd8-8ffb-876a" type="rule"/>
+        <infoLink id="2fc0-4117-8ced-f664" name="Impact Hits (D6)" hidden="false" targetId="e9e6-66cc-623f-8e94" type="rule"/>
         <infoLink id="f8dd-64c4-2c58-fd9c" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
         <infoLink id="8e7f-76a4-df51-b743" name="Rhinox War Chariot" hidden="false" targetId="17f0-326b-1d42-a423" type="profile"/>
         <infoLink id="7cf3-60c3-a81e-1a42" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
@@ -4340,6 +4274,7 @@ and Multiple Wounds (D3).</characteristic>
           </constraints>
           <infoLinks>
             <infoLink id="cc5f-de1a-52a1-bacd" name="Rhinox" hidden="false" targetId="fc1f-f1f3-119e-63ec" type="profile"/>
+            <infoLink id="bfcf-ad8a-5c96-26d0" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -4354,7 +4289,7 @@ and Multiple Wounds (D3).</characteristic>
             <infoLink id="3c7f-1488-1d6a-eb6d" name="Ogre" hidden="false" targetId="7a76-66b8-73bb-d4b1" type="profile"/>
           </infoLinks>
           <selectionEntries>
-            <selectionEntry id="9b68-763e-7f6b-ec5d" name="Hand Weapon" hidden="false" collective="true" import="true" type="upgrade">
+            <selectionEntry id="9b68-763e-7f6b-ec5d" name="Hand Weapon" 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="394c-c52f-6d3b-3d64" type="max"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e386-729e-5eba-32eb" type="min"/>
@@ -4366,6 +4301,18 @@ and Multiple Wounds (D3).</characteristic>
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="ac10-8aff-6114-1900" name="Light Armor" 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="d9ad-6ed4-e618-8454" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7781-70d3-f7d7-3889" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="69e8-93d8-99af-842f" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -4403,7 +4350,7 @@ and Multiple Wounds (D3).</characteristic>
           </profiles>
           <rules>
             <rule id="b6ea-e4fb-f5b0-af02" name="Trappers" publicationId="9e23-79cb-pubN78137" page="97" hidden="false">
-              <description>Every model in an enemy unit that successfully charges the Gnoblars front must take a Dangerous Terrain test as soon as the charge is completed.</description>
+              <description>Each enemy unit that successfully charges the Gnoblar Trappers&apos; front must take D3 Dangerous Terrain tests for each Trapper as soon as the charge is completed.</description>
             </rule>
           </rules>
           <infoLinks>
@@ -4493,7 +4440,7 @@ and Multiple Wounds (D3).</characteristic>
             <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
             <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
             <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save (5+)</characteristic>
+            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot Armour save (6+)</characteristic>
           </characteristics>
         </profile>
         <profile id="417f-539f-8e96-8a36" name="Scraplauncher Catapult" publicationId="9e23-79cb-pubN78137" page="95" hidden="false" typeId="781d-35fe-dd22-05d6" typeName="War Machine">
@@ -4523,6 +4470,7 @@ and Multiple Wounds (D3).</characteristic>
           </constraints>
           <infoLinks>
             <infoLink id="223b-242b-f1b4-89de" name="Rhinox" hidden="false" targetId="fc1f-f1f3-119e-63ec" type="profile"/>
+            <infoLink id="5623-aa5b-e0e9-b2e5" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -4572,7 +4520,7 @@ and Multiple Wounds (D3).</characteristic>
             <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
             <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
             <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save (5+)</characteristic>
+            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot Armour save (6+)</characteristic>
           </characteristics>
         </profile>
         <profile id="1c3d-6b32-9c1a-41b6" name="Skewerslinger" publicationId="9e23-79cb-pubN78137" page="96" hidden="false" typeId="781d-35fe-dd22-05d6" typeName="War Machine">
@@ -4607,6 +4555,7 @@ and Multiple Wounds (D3).</characteristic>
           </constraints>
           <infoLinks>
             <infoLink id="a6d7-a885-5192-5190" name="Rhinox" hidden="false" targetId="fc1f-f1f3-119e-63ec" type="profile"/>
+            <infoLink id="8cb2-41c6-67cf-74a9" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -4852,7 +4801,7 @@ and Multiple Wounds (D3).</characteristic>
             <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
             <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
             <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save (5+)</characteristic>
+            <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot Armour save (6+)</characteristic>
           </characteristics>
         </profile>
         <profile id="1a27-e461-e6f6-6216" name="Cannon of the Sky-titans" publicationId="9e23-79cb-pubN78137" page="80" hidden="false" typeId="781d-35fe-dd22-05d6" typeName="War Machine">
@@ -4904,6 +4853,7 @@ If a misfire is rolled on the first artillery dice, roll a D6 and consult the Ir
           </constraints>
           <infoLinks>
             <infoLink id="389b-a4e0-636a-1abb" name="Rhinox" hidden="false" targetId="fc1f-f1f3-119e-63ec" type="profile"/>
+            <infoLink id="7f5f-6d8e-ac88-df89" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -4969,6 +4919,18 @@ If a misfire is rolled on the first artillery dice, roll a D6 and consult the Ir
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="bea3-5246-2d11-cc6d" name="Light Armor" 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="1911-54eb-644f-4c93" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c2b0-2065-2e95-f198" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="7a8b-f163-1dd4-d775" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -4976,7 +4938,7 @@ If a misfire is rolled on the first artillery dice, roll a D6 and consult the Ir
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="170.0"/>
+        <cost name="pts" typeId="points" value="180.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="916e-f0d1-28b4-2ab1" name="Slavegiant" hidden="false" collective="false" import="true" type="model">
@@ -5007,15 +4969,17 @@ If a misfire is rolled on the first artillery dice, roll a D6 and consult the Ir
         </profile>
         <profile id="8cf1-030c-9bde-5699" name="Result" publicationId="9e23-79cb-pubN78137" page="100" hidden="false" typeId="1c07-e75c-f50c-09f1" typeName="Big Things Chart (Slavegiant)">
           <characteristics>
-            <characteristic name="1" typeId="c81c-a4ad-dc41-bf5d">Yell and Brawl: Neither the Giant nor models in contact with him actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points (if both sides have a Giant that Yells and Bawls, the combat is a draw).</characteristic>
+            <characteristic name="1" typeId="c81c-a4ad-dc41-bf5d">Yell and Brawl: Neither the Giant nor models in contact with him actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points. This result has no effect against Animated Constructs.</characteristic>
             <characteristic name="2-4" typeId="74e3-28f3-9ca2-7075">Throttle with Chain: The target must take a T test. If this is failed, it sustains 2D6 wounds with no Armour Save allowed.</characteristic>
             <characteristic name="5-6" typeId="926b-b314-20e5-911d">&apos;Eadbutt: The Giant head-butts a single enemy model from the target unit, automatically inflicting D3 wounds which Ignores Armour Saves. If the victim is wounded but not slain, then it is dazed and loses all of its following attacks. If the target has not yet attacked in that combat round, it loses those attacks; if it has already attacked, then it loses the next round&apos;s attacks.</characteristic>
           </characteristics>
         </profile>
         <profile id="cb8a-3dfc-3503-0105" name="Result" publicationId="9e23-79cb-pubN78137" page="100" hidden="false" typeId="4bc3-9893-db6d-959c" typeName="Small Things Chart (Slavegiant)">
           <characteristics>
-            <characteristic name="1" typeId="e392-20d2-7b99-4e84">Yell and Brawl: Neither the Giant nor models in contact with him actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points (if both sides have a Giant that Yells and Bawls, the combat is a draw). This result has no effect against Animated Constructs.</characteristic>
-            <characteristic name="2" typeId="eb1c-ff33-9629-bb04">Jump Up and Down: The Giant jumps up and down vigorously on top of the enemy. Before it starts, the Giant must test to determine if it falls over. If it falls over, work out where it falls and calculate damage. Any wounds caused by the fall (on either side) count towards the combat result. If the Giant remains on its none-too-nimble feet, it will inflict two Stomp attacks. Giants enjoy jumping up and down on their enemies so much that a Giant that does so in one combat round will automatically do so in the following round if it is able to, assuming that it did not fall over in the previous round. A Giant that starts to Jump Up and Down will therefore continue to do so on the same target until it falls over, the target is destroyed, or the combat ends.</characteristic>
+            <characteristic name="1" typeId="e392-20d2-7b99-4e84">Yell and Brawl: Neither the Giant nor models in contact with him actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points. This result has no effect against Animated Constructs.</characteristic>
+            <characteristic name="2" typeId="eb1c-ff33-9629-bb04">Jump Up and Down: The Giant jumps up and down vigorously on top of the enemy. Before it starts, the Giant must test to determine if it falls over. If it falls over, work out where it falls and calculate damage. Any wounds caused by the fall (on either side) count towards the combat result. If the Giant remains on its none-too-nimble feet, it will inflict two Stomp attacks. 
+
+Giants enjoy jumping up and down on their enemies so much that a Giant that does so in one combat round will automatically do so in the following round if it is able to, assuming that it did not fall over in the previous round. A Giant that starts to Jump Up and Down will therefore continue to do so on the same target until it falls over, the target is destroyed, or the combat ends.</characteristic>
             <characteristic name="3" typeId="ce5c-ccc1-13b8-a1e5">Pick Up and...: The Giant stoops down and grabs a single Character in base contact from the target unit (Giant player&apos;s choice). If no character is present in base contact, roll again on the Man-sized Things chart until you get another result. The Giant grabs the model and the player rolls a D6 on the Pick Up and... table.</characteristic>
             <characteristic name="4-6" typeId="857e-1cfe-ddec-27f3">Flail with Chain: The Slavegiant inflicts D6 S 6 hits on the target unit, allocated as shooting hits.</characteristic>
           </characteristics>
@@ -5231,21 +5195,21 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
           <characteristics>
             <characteristic name="1-2" typeId="48ba-a116-01c6-c096">Butt: The Mammoth inflicts one automatic hit against one model in base contact (your choice), causing D3 S 7 hits with Multiple Wounds (D3).</characteristic>
             <characteristic name="3-5" typeId="dc3a-1443-f365-33b8">Gore: The Mammoth makes D6 attacks against a chosen unit in dose combat with Heroic Killing Blow.</characteristic>
-            <characteristic name="6" typeId="3eca-abd3-505e-e4f5">Bellow: Neither the Mammoth nor any unit in contact with it fight if they have not already done so this turn. The army fielding the Mammoth automatically wins the combat by 3 points.</characteristic>
+            <characteristic name="6" typeId="3eca-abd3-505e-e4f5">Bellow: Neither the Mammoth nor any unit in contact with it fight if they have not already done so this turn. The Mammoth automatically wins the combat by 3 points or more. This result has no effect against Animated Constructs.</characteristic>
           </characteristics>
         </profile>
         <profile id="686d-ed43-c894-f17d" name="Result" publicationId="9e23-79cb-pubN78137" page="91" hidden="false" typeId="87e3-7053-1d16-9d13" typeName="Small Targets Table (Ice Mammoth)">
           <characteristics>
             <characteristic name="1-2" typeId="a0c1-5f83-563b-cb79">Trample: A single enemy unit suffers D6 S 7 hits for each rank of five or more models it has.</characteristic>
             <characteristic name="3-4" typeId="4ffc-eb64-9ba8-ef4c">Stomp: The Mammoth makes three Stomp attacks this turn.</characteristic>
-            <characteristic name="5" typeId="9677-ddbe-75dd-956b">Bellow: Neither the Mammoth nor any unit in contact with it fight if they have not already done so this turn. The army fielding the Mammoth automatically wins the combat by 3 points.</characteristic>
-            <characteristic name="6" typeId="5eec-16c2-20bd-16a8">Pick up and...: This attack may target model in base contact or touching a model in base contact. The target may make a single attack to fend off the trunk: If this attack hits and wounds the Mammoth, than the Mammoth&apos;s attack fails. If not then the Mammoth grabs the model. Roll a D6 and consult the Pick up and... Table.</characteristic>
+            <characteristic name="5" typeId="9677-ddbe-75dd-956b">Bellow: Neither the Mammoth nor any unit in contact with it fight if they have not already done so this turn. The Mammoth automatically wins the combat by 3 points or more. This result has no effect against Animated Constructs.</characteristic>
+            <characteristic name="6" typeId="5eec-16c2-20bd-16a8">Pick up and...: The Mammoth uses its agile trunk to grab a helpless enemy Character from the target unit (Mammoth player&apos;s choice). If no character is present in base contact, roll again on the Man-sized Things Chart until you get another result. Roll a D6 on the Pick up and... Table.</characteristic>
           </characteristics>
         </profile>
         <profile id="bf07-5791-6b29-28b3" name="Result" publicationId="9e23-79cb-pubN78137" page="91" hidden="false" typeId="0e31-9fb9-8678-1678" typeName="Pick up and... Table (Ice Mammoth)">
           <characteristics>
-            <characteristic name="1-2" typeId="10d2-137f-eb05-aae8">Throw Back into Combat: This causes D6 wounds on the grabbed model with no armour saving throws allowed, and 2D6 S 4 hits (saves as normal) on the enemy unit. If the thrown model survives, place it back in the unit where it may carry on as normal.</characteristic>
-            <characteristic name="3-4" typeId="70db-d602-db26-4c00">Hurl: This works as per the ‘Throw back into combat’ result above except that the target unit may be any chosen enemy unit within 18&quot; If no such unit is available, treat this as a ‘Throw back into combat’ result instead. In either case should the hurled victim survive, it is placed in the back rank of the impacted unit.</characteristic>
+            <characteristic name="1-2" typeId="10d2-137f-eb05-aae8">Throw Back into Combat: The victim is hurled back into their own unit like a missile. The victim suffers D3 S 6 Hits which Ignores Armour saves, and D6 S 3 hits are inflicted on the unit (save as normal).</characteristic>
+            <characteristic name="3-4" typeId="70db-d602-db26-4c00">Hurl: The victim is hurled into an enemy unit within 12&quot; of the Mammoth – randomly determine which. The victim is removed as a casualty, and the unit takes D6 S 3 hits. Unsaved Wounds from these hits count towards the Mammoth&apos;s combat result. If no enemy units are in range, treat this as a Throw Back into Combat result instead.</characteristic>
             <characteristic name="5" typeId="4380-595a-db66-317d">Eat: The victim model is removed as a casualty, and the Mammoth may immediately recover a single wound it has lost previously in the game.</characteristic>
             <characteristic name="6" typeId="f600-5b21-c388-bda4">Squash and grab another: The model is removed as a casualty and the Mammoth then picks another victim. Roll again on the ‘Pick up and...’ chart-to see what happens.</characteristic>
           </characteristics>
@@ -5253,7 +5217,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
       </profiles>
       <rules>
         <rule id="78b4-1483-03f9-c492" name="Mammoth Attacks" publicationId="9e23-79cb-pubN78137" page="91" hidden="false">
-          <description>When the Ice Mammoth attacks, roll on the appropriate table to determine its action. Roll on the Small Targets table when fighting Swarms, Infantry, Cavalry or War Beasts. Roll on the Other Targets table when fighting anything else.</description>
+          <description>When the Ice Mammoth attacks, roll on the appropriate table to determine its action. Roll on the Man-sized Things Chart table when fighting Swarms, Infantry, Cavalry or War Beasts. Roll on the Big Things Chart when fighting Monsters, Monstrous Beasts, Monstrous Infantry, Monstrous Cavalry, Chariots, War Machines, and Shrines with Large Target.</description>
         </rule>
       </rules>
       <infoLinks>
@@ -5443,7 +5407,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
             </selectionEntry>
           </selectionEntries>
           <costs>
-            <cost name="pts" typeId="points" value="43.0"/>
+            <cost name="pts" typeId="points" value="40.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -5818,7 +5782,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
           <profiles>
             <profile id="2229-1515-8335-de89" name="Kineater" publicationId="9e23-79cb-pubN78137" page="115" hidden="false" typeId="dcfb-308c-d238-54ac" typeName="Big Name">
               <characteristics>
-                <characteristic name="Effect" typeId="5094-a2ae-3070-0519">Tyrants only. Any friendly unit within 12&quot; of a Kineater may re-roll failed Panic tests.</characteristic>
+                <characteristic name="Effect" typeId="5094-a2ae-3070-0519">Tyrants only. Any friendly unit within 12&quot; of a Kineater roll 3D6 for their Panic tests and discards the highest dice rolled.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -5935,7 +5899,7 @@ Once on the ground a Giant may get up in his following Movement phase, but may n
             </profile>
           </profiles>
           <costs>
-            <cost name="pts" typeId="points" value="20.0"/>
+            <cost name="pts" typeId="points" value="15.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -6081,7 +6045,7 @@ If the Thundercrush Attack hits, place the small template anywhere so that it is
           <profiles>
             <profile id="52c3-8947-63e4-e62d" name="Hellheart" publicationId="9e23-79cb-pubN78137" page="117" hidden="false" typeId="24d7-7f7d-a4d7-c26c" typeName="Arcane Item">
               <characteristics>
-                <characteristic name="Special Rules" typeId="3df8-4ab0-c4bd-e2ad">One Use Only. The Hellheart can be used at the start of one of the opposing side&apos;s Magic phases, immediately after rolling for the Winds of Magic. All enemy Wizards within 12&quot; of the bearer must roll on the Miscast table. Special rules or magic items that affect a normal miscast roll can be used against miscasts caused by the Hellheart. After resolving all the miscasts, add an extra dispel dice to the Ogre&apos;s dispel pool for each enemy Wizard that was forced to roll on the Miscast table.</characteristic>
+                <characteristic name="Special Rules" typeId="3df8-4ab0-c4bd-e2ad">One Use Only. The Hellheart can be used at the start of one of the opposing side&apos;s Magic phases, immediately after rolling for the Winds of Magic. All enemy Wizards within 12&quot; of the bearer must roll 2D6 on the Miscast table. Special rules or magic items that affect a normal miscast roll can be used against miscasts caused by the Hellheart. After resolving all the Miscasts, add an extra dispel dice to the Ogre&apos;s dispel pool for each enemy Wizard that was forced to roll on the Miscast table.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -6220,7 +6184,7 @@ If the Thundercrush Attack hits, place the small template anywhere so that it is
       <description>The riders of a this Monster does not count as Moving and Shooting.</description>
     </rule>
     <rule id="a07f-3534-f3c1-b420" name="Beneath Contempt" publicationId="9e23-79cb-pubN78137" page="93" hidden="false">
-      <description>Gnoblars have Expendable. In addition, Ogre characters may not join units of Gnoblars.</description>
+      <description>Gnoblars have Expendable. In addition, even other Gnoblars treat them as being Expendable.</description>
     </rule>
     <rule id="d99d-6da7-c8fd-bd98" name="Bicker" publicationId="9e23-79cb-pubN78137" page="93" hidden="false">
       <description>Roll a D6 at the beginning of the turn for this unit if it is not in combat, fleeing or subject to any compulsory movement. If the unit rolls a 1 it may do nothing at all this turn.</description>
@@ -6237,6 +6201,12 @@ If the Thundercrush Attack hits, place the small template anywhere so that it is
     <rule id="5c23-5b1c-8b01-0554" name="Motley Crew" publicationId="9e23-79cb-pubN78137" page="73" hidden="false">
       <description>The models in a unit of Maneaters are often armed with a variety of different weapons. If they are, your opponent must make it clear which model they want to allocate their attacks to. Any excess wounds are carried over to the rest of the unit as normal in an order chosen by your opponent.</description>
     </rule>
+    <rule id="1473-ae44-e14c-a3cd" name="Hunter" publicationId="9e23-79cb-pubN78137" page="125" hidden="false">
+      <description>A Hunter with a mount loses Scouts.</description>
+    </rule>
+    <rule id="cde9-e208-3420-4544" name="Jhared the Red" publicationId="9e23-79cb-pubN78137" page="123" hidden="false">
+      <description>If Jhared picks a mount, he loses Scouts.</description>
+    </rule>
   </sharedRules>
   <sharedProfiles>
     <profile id="6762-6a5b-4d19-dc9f" name="Ironfist" publicationId="9e23-79cb-pubN78137" page="56" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
@@ -6308,7 +6278,7 @@ mounted. You must choose which function you want to use at the start of each clo
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 4+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="60f7-5ede-98ef-b409" name="Stonehorn" publicationId="9e23-79cb-pubN78137" page="87" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -6477,7 +6447,7 @@ mounted. You must choose which function you want to use at the start of each clo
       <characteristics>
         <characteristic name="M" typeId="09ad-18df-607b-1215">6</characteristic>
         <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
-        <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
+        <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">4</characteristic>
         <characteristic name="S" typeId="edd2-7979-54a4-6b35">5</characteristic>
         <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
         <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
@@ -6491,7 +6461,7 @@ mounted. You must choose which function you want to use at the start of each clo
       <characteristics>
         <characteristic name="M" typeId="09ad-18df-607b-1215">6</characteristic>
         <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
-        <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">3</characteristic>
+        <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">4</characteristic>
         <characteristic name="S" typeId="edd2-7979-54a4-6b35">5</characteristic>
         <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
         <characteristic name="W" typeId="27ee-0675-122f-a1b1">3</characteristic>
diff --git a/Orcs__Goblins.cat b/Orcs__Goblins.cat
index 5310f38..63ebcdf 100644
--- a/Orcs__Goblins.cat
+++ b/Orcs__Goblins.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="62ee-24f6-1508-ac6a" name="Orcs &amp; Goblins" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="62ee-24f6-1508-ac6a" name="Orcs &amp; Goblins" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="9a0d-50bf-b007-6cef" name="Animosity Table">
       <characteristicTypes>
@@ -364,7 +364,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -797,7 +798,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1902,6 +1904,18 @@
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="a48c-20d5-b806-ff3d" name="Light Armour" 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="c4b4-5974-f459-b026" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3b1c-e62a-fa96-9f26" type="min"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="a7df-ac59-6e23-3786" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -1915,6 +1929,7 @@
                   <infoLinks>
                     <infoLink id="88dc-e2d9-1ee2-c575" name="War Boar" hidden="false" targetId="e5ff-5bf1-2cf1-e269" type="profile"/>
                     <infoLink id="73f3-3ea9-cbc2-bd66" name="Tusker Charge" hidden="false" targetId="9044-efe2-16a7-9850" type="rule"/>
+                    <infoLink id="3f41-56bc-9f1f-0bb0" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
                   </infoLinks>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -2179,7 +2194,7 @@
                         <infoLink id="94fa-a20d-01a1-3c68" name="Stomp" hidden="false" targetId="668c-19e8-b764-8549" type="rule"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="220.0"/>
+                        <cost name="pts" typeId="points" value="250.0"/>
                       </costs>
                     </selectionEntry>
                     <selectionEntry id="ced0-af5d-62c2-a9b8" name="Wyvern" hidden="false" collective="false" import="true" type="model">
@@ -2462,6 +2477,18 @@
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="940e-8198-7cba-baca" name="Light Armour" 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="bd2b-bc50-5efd-2ae0" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3236-bfa4-64d4-5577" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="c1d9-8ca8-c524-693b" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -2474,7 +2501,8 @@
                           </constraints>
                           <infoLinks>
                             <infoLink id="8b44-5e7c-3f01-608f" name="War Boar" hidden="false" targetId="e5ff-5bf1-2cf1-e269" type="profile"/>
-                            <infoLink id="3e05-2eb4-de92-6b29" name="Tusker Charge" hidden="false" targetId="9044-efe2-16a7-9850" type="rule"/>
+                            <infoLink id="3e05-2eb4-de92-6b29" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
+                            <infoLink id="b89b-79f8-f812-239b" name="Tusker Charge" hidden="false" targetId="9044-efe2-16a7-9850" type="rule"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -2500,7 +2528,7 @@
                         <infoLink id="99df-247d-c6a5-baa2" name="Stomp" hidden="false" targetId="668c-19e8-b764-8549" type="rule"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="220.0"/>
+                        <cost name="pts" typeId="points" value="250.0"/>
                       </costs>
                     </selectionEntry>
                     <selectionEntry id="beb7-81cb-2474-0a30" name="Wyvern" hidden="false" collective="false" import="true" type="model">
@@ -2925,6 +2953,18 @@
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="c2cf-dcb0-5039-f133" 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="c200-429c-b75d-9a50" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6fc9-184d-c45f-3926" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="8ba2-c40e-2cbc-37f5" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="3.0"/>
@@ -3372,6 +3412,18 @@
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="3574-feb9-7c2e-ca36" name="Light Armour" 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="af7f-ae56-363d-659b" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="67ab-9044-5af0-3bea" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="a040-53d0-8a2a-3b47" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -3385,6 +3437,7 @@
                           <infoLinks>
                             <infoLink id="03cc-b7b3-90ae-4233" name="War Boar" hidden="false" targetId="e5ff-5bf1-2cf1-e269" type="profile"/>
                             <infoLink id="e9b1-d7b6-e314-ad4c" name="Tusker Charge" hidden="false" targetId="9044-efe2-16a7-9850" type="rule"/>
+                            <infoLink id="3bdd-d77f-90a3-3b74" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -3410,7 +3463,7 @@
                         <infoLink id="680d-cf1e-8746-c6e6" name="Stomp" hidden="false" targetId="668c-19e8-b764-8549" type="rule"/>
                       </infoLinks>
                       <costs>
-                        <cost name="pts" typeId="points" value="220.0"/>
+                        <cost name="pts" typeId="points" value="250.0"/>
                       </costs>
                     </selectionEntry>
                     <selectionEntry id="2330-8300-9e66-9bd1" name="Wyvern" hidden="false" collective="false" import="true" type="model">
@@ -3576,6 +3629,18 @@
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="c8c8-485e-1976-bbbc" name="Light Armour" 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="f962-ba9a-e99b-4b9a" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e528-b29c-38c3-138c" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="d431-e7e6-e86a-c593" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -3589,6 +3654,7 @@
                           <infoLinks>
                             <infoLink id="85c2-0fb0-1d91-15ef" name="War Boar" hidden="false" targetId="e5ff-5bf1-2cf1-e269" type="profile"/>
                             <infoLink id="938d-cc20-0c56-7c09" name="Tusker Charge" hidden="false" targetId="9044-efe2-16a7-9850" type="rule"/>
+                            <infoLink id="f223-a25d-deb0-bec1" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -3635,7 +3701,8 @@
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3667,7 +3734,8 @@
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3819,7 +3887,8 @@
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3851,7 +3920,8 @@
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3952,7 +4022,8 @@
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3984,7 +4055,8 @@
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4131,6 +4203,18 @@
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="5b87-d991-2cb5-b695" 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="df07-2cbc-898a-7887" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b3f6-cfea-7495-8d00" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="6b6f-a0ef-78ae-ee31" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="3.0"/>
@@ -4171,7 +4255,8 @@
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4203,7 +4288,8 @@
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4446,7 +4532,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4478,7 +4565,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4614,7 +4702,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4646,7 +4735,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4747,7 +4837,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4779,7 +4870,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4899,7 +4991,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4931,7 +5024,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5044,7 +5138,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5076,7 +5171,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5191,7 +5287,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5223,7 +5320,8 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5423,6 +5521,18 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="60e9-9908-cbea-0781" name="Light Armour" 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="22ee-d565-f8f7-1736" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c3c5-dc1f-badd-b974" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="84a2-aa89-0f59-061c" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -5436,6 +5546,7 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                           <infoLinks>
                             <infoLink id="328c-8e21-f832-fe7b" name="War Boar" hidden="false" targetId="e5ff-5bf1-2cf1-e269" type="profile"/>
                             <infoLink id="9742-bbb8-b17a-eadb" name="Tusker Charge" hidden="false" targetId="9044-efe2-16a7-9850" type="rule"/>
+                            <infoLink id="b559-449b-8d49-1323" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -5720,6 +5831,18 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="729b-94ef-25fb-aa00" 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="ce8f-5631-e7cd-274c" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="55e6-00e7-52d6-19fb" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="016d-829d-f0f9-1c3b" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="3.0"/>
@@ -6321,6 +6444,18 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="805a-dec4-e234-64b5" name="Light Armour" 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="7b86-6132-7d61-a6b0" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2846-60e0-700a-bb04" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="a9ba-e6f9-ae02-58fc" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -6334,6 +6469,7 @@ da Spider God). In addition, he and any other friendly Wizard within 12&quot; of
                           <infoLinks>
                             <infoLink id="2057-1d38-76d8-0f85" name="War Boar" hidden="false" targetId="e5ff-5bf1-2cf1-e269" type="profile"/>
                             <infoLink id="19f1-74eb-4744-8be7" name="Tusker Charge" hidden="false" targetId="9044-efe2-16a7-9850" type="rule"/>
+                            <infoLink id="7084-6215-b9b1-9ce8" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
                           </infoLinks>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -8031,55 +8167,63 @@ At the start of each round of close combat in which a Goblin Jester is involved,
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="ff99-5f58-0699-9453" 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="f367-d969-9270-893d" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f792-ddee-0362-997f" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="41a3-9d5a-3aae-fc02" 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>
           <selectionEntryGroups>
-            <selectionEntryGroup id="4e82-803a-75c6-e454" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="fe6b-0ef8-3df7-2b9e">
+            <selectionEntryGroup id="4e82-803a-75c6-e454" name="Equipment" hidden="false" collective="false" import="true" defaultSelectionEntryId="fe6b-0ef8-3df7-2b9e">
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2c5f-f080-183a-942f" type="max"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b4de-f902-4c80-0eeb" type="min"/>
               </constraints>
               <selectionEntries>
-                <selectionEntry id="dbf6-b1a7-cbce-b82d" name="Spear (Mounted) &amp; Shield" hidden="false" collective="true" import="true" type="upgrade">
+                <selectionEntry id="dbf6-b1a7-cbce-b82d" name="Spear (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="6cb9-491f-fcdd-df4f" type="max"/>
                   </constraints>
                   <infoLinks>
                     <infoLink id="823d-0fbc-e4f4-eeaa" name="Spear (Mounted)" hidden="false" targetId="b2d2-2eb6-2bd2-ddbb" type="profile"/>
-                    <infoLink id="26ce-8c7d-ff25-a8e5" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
                   </infoLinks>
                   <costs>
                     <cost name="pts" typeId="points" value="1.0"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="41e9-5204-f91b-0fe2" name="Hand Weapon &amp; Shortbow" hidden="false" collective="true" import="true" type="upgrade">
+                <selectionEntry id="41e9-5204-f91b-0fe2" name="Shortbow" 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="eaab-94bd-65ed-4956" type="max"/>
                   </constraints>
                   <infoLinks>
                     <infoLink id="ae17-6eb3-7059-0d29" name="Short Bow" hidden="false" targetId="487e-16a4-8ab8-2c85" type="profile"/>
-                    <infoLink id="951c-171d-dfaf-85a6" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
                   </infoLinks>
                   <costs>
-                    <cost name="pts" typeId="points" value="1.0"/>
+                    <cost name="pts" typeId="points" value="2.0"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="fe6b-0ef8-3df7-2b9e" name="Hand Weapon &amp; Shield" hidden="false" collective="true" import="true" type="upgrade">
+                <selectionEntry id="fe6b-0ef8-3df7-2b9e" 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="e8bc-1b95-dcac-f8d2" type="max"/>
                   </constraints>
                   <infoLinks>
-                    <infoLink id="f278-d5a9-511f-6c4b" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
                     <infoLink id="285f-9fdd-1912-63bb" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
                   </infoLinks>
                   <costs>
-                    <cost name="pts" typeId="points" value="0.0"/>
+                    <cost name="pts" typeId="points" value="1.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
             </selectionEntryGroup>
           </selectionEntryGroups>
           <costs>
-            <cost name="pts" typeId="points" value="10.0"/>
+            <cost name="pts" typeId="points" value="9.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -8121,7 +8265,7 @@ At the start of each round of close combat in which a Goblin Jester is involved,
                 <infoLink id="8376-7ab4-3490-b655" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="44aa-67b6-7405-6465" name="Standard Bearer" hidden="false" collective="false" import="true" type="upgrade">
@@ -8216,55 +8360,63 @@ At the start of each round of close combat in which a Goblin Jester is involved,
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="e03c-752b-26d8-f970" 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="cc2e-021f-198b-844d" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4e1f-654f-dfac-6d22" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="0b31-2dab-7fbb-ebe2" 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>
           <selectionEntryGroups>
-            <selectionEntryGroup id="57df-6e6d-f58d-c30a" name="Primary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="40c6-d1bd-8815-88e3">
+            <selectionEntryGroup id="fc78-c745-1500-d233" name="Equipment" hidden="false" collective="false" import="true">
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c70d-5afa-ac39-a001" type="max"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb01-5fca-77fd-dfec" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e867-4378-5aad-3ea0" type="min"/>
               </constraints>
               <selectionEntries>
-                <selectionEntry id="42cc-6157-4caa-b2cc" name="Spear (Mounted) &amp; Shield" hidden="false" collective="true" import="true" type="upgrade">
+                <selectionEntry id="f24d-4d8c-63a5-3291" name="Spear (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="1133-a5be-193f-9d60" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="afd6-7e81-7cb8-e214" type="max"/>
                   </constraints>
                   <infoLinks>
-                    <infoLink id="d233-e448-df87-3463" name="Spear (Mounted)" hidden="false" targetId="b2d2-2eb6-2bd2-ddbb" type="profile"/>
-                    <infoLink id="1575-3890-1a66-9e3c" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
+                    <infoLink id="dea0-dc5c-9a53-89f9" name="Spear (Mounted)" hidden="false" targetId="b2d2-2eb6-2bd2-ddbb" type="profile"/>
                   </infoLinks>
                   <costs>
                     <cost name="pts" typeId="points" value="1.0"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="d291-3fb6-fcbe-8625" name="Hand Weapon &amp; Shortbow" hidden="false" collective="true" import="true" type="upgrade">
+                <selectionEntry id="42ee-ccad-c288-d6a1" name="Shortbow" 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="2bbb-cbe9-91d2-7954" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3b60-ed1a-eb92-655e" type="max"/>
                   </constraints>
                   <infoLinks>
-                    <infoLink id="6591-23d3-72f9-e0bc" name="Short Bow" hidden="false" targetId="487e-16a4-8ab8-2c85" type="profile"/>
-                    <infoLink id="aab6-b7db-32f2-6a65" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
+                    <infoLink id="84fa-c490-b9d1-0427" name="Short Bow" hidden="false" targetId="487e-16a4-8ab8-2c85" type="profile"/>
                   </infoLinks>
                   <costs>
-                    <cost name="pts" typeId="points" value="1.0"/>
+                    <cost name="pts" typeId="points" value="2.0"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="40c6-d1bd-8815-88e3" name="Hand Weapon &amp; Shield" hidden="false" collective="true" import="true" type="upgrade">
+                <selectionEntry id="d542-4579-e8a0-bd43" 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="3586-b2eb-c1ab-17bc" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e51e-ef90-8162-ed5a" type="max"/>
                   </constraints>
                   <infoLinks>
-                    <infoLink id="27b2-3ee8-f4b5-656a" name="Hand Weapon" hidden="false" targetId="f6da-d707-0cd6-b1dd" type="profile"/>
-                    <infoLink id="d28c-0775-2ee0-28fb" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
+                    <infoLink id="354a-6430-f492-c1f0" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
                   </infoLinks>
                   <costs>
-                    <cost name="pts" typeId="points" value="0.0"/>
+                    <cost name="pts" typeId="points" value="1.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
             </selectionEntryGroup>
           </selectionEntryGroups>
           <costs>
-            <cost name="pts" typeId="points" value="11.0"/>
+            <cost name="pts" typeId="points" value="10.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -8306,7 +8458,7 @@ At the start of each round of close combat in which a Goblin Jester is involved,
                 <infoLink id="d8da-0613-19ab-5e6d" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="aa7a-c3f3-5500-cde2" name="Standard Bearer" hidden="false" collective="false" import="true" type="upgrade">
@@ -8874,7 +9026,7 @@ they are ready to be pushed out towards the enemy. If a concealing unit flees or
                 <infoLink id="fb82-7e0c-321c-d3b0" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="a36f-c39d-2e79-bc97" name="Standard Bearer" hidden="false" collective="false" import="true" type="upgrade">
@@ -9074,7 +9226,7 @@ they are ready to be pushed out towards the enemy. If a concealing unit flees or
                 <infoLink id="1e7f-690d-d58f-56ca" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="169a-03db-e215-a441" name="Standard Bearer" hidden="false" collective="false" import="true" type="upgrade">
@@ -10612,6 +10764,18 @@ they are ready to be pushed out towards the enemy. If a concealing unit flees or
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="f2d3-79ca-3e34-9f11" 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="9dca-38a1-3101-4172" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="549a-af83-3530-e952" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="9ae9-7db8-7f8d-eec6" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -10625,6 +10789,7 @@ they are ready to be pushed out towards the enemy. If a concealing unit flees or
           <infoLinks>
             <infoLink id="8847-7a50-a94c-4e9d" name="War Boar" hidden="false" targetId="e5ff-5bf1-2cf1-e269" type="profile"/>
             <infoLink id="3332-3282-622a-c55a" name="Tusker Charge" hidden="false" targetId="9044-efe2-16a7-9850" type="rule"/>
+            <infoLink id="3a37-dd70-a32a-8329" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -10686,6 +10851,18 @@ they are ready to be pushed out towards the enemy. If a concealing unit flees or
                     <cost name="pts" typeId="points" value="0.0"/>
                   </costs>
                 </selectionEntry>
+                <selectionEntry id="85b0-8dfd-271c-c1ea" 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="f56f-ecca-eb93-cf17" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6e32-1537-91ab-0fd9" type="min"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="0e02-e9db-5156-89da" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="0.0"/>
+                  </costs>
+                </selectionEntry>
               </selectionEntries>
               <costs>
                 <cost name="pts" typeId="points" value="3.0"/>
@@ -11875,7 +12052,7 @@ When Mangler Squigs move through a unit (friend or foe) they inflict 2D6 S 6 hit
           <characteristics>
             <characteristic name="1-4" typeId="6498-d33c-fe29-da67">Acid Guts: Every model within 6&quot; of the Squig Gobba (including the Night Goblin Tenders) takes a Strength 2 Hit which Ignores Armour saves.</characteristic>
             <characteristic name="5-9" typeId="c438-2be4-66a7-4ddb">Stomach Rumblings: Nothing happens this turn, but you must instead roll 4D6 when firing the Squig Gobba next shooting phase.</characteristic>
-            <characteristic name="10-16" typeId="c3c9-b845-2ebb-789b">Squig Torrent: This is resolved as a shot from a Stone Thrower that uses the large template with a range of 24&quot;. Any model covered by the template suffers a S 4 hit. If a misfire is rolled, the Squig Gobba suffers D3
+            <characteristic name="10-16" typeId="c3c9-b845-2ebb-789b">Squig Torrent: This is resolved as a shot from a Stone Thrower that uses the large template with a range of 36&quot;. Any model covered by the template suffers a S 4 hit. If a misfire is rolled, the Squig Gobba suffers D3
 Wounds and the shot is wasted.</characteristic>
             <characteristic name="17-18" typeId="bd78-d377-d3b7-83b2">Intestinal Explosion: The Squig Gobba immediately makes a Breath Weapon Attack at S 6. After the attack has been resolved, the Squig Gobba suffers D3 Wounds.</characteristic>
           </characteristics>
@@ -12487,7 +12664,8 @@ The target has its WS reduced to 1 until the end of the next turn. This has no e
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -13171,8 +13349,7 @@ Roll a D6 for each eligible unit. If the dice roll is a 2 or more, the unit beha
       <description>The only unit a Night Goblin character mounted on a Great Cave Squig is allowed to join is a Squig Hopper unit. He is allowed to do this even though characters are not normally allowed to join Squig Hopper units.</description>
     </rule>
     <rule id="1f41-5c93-ec94-d3c3" name="Spider Venom" publicationId="9e23-79cb-pubN78975" page="156" hidden="false">
-      <description>Forest Goblin Shamans may re-roll one dice (except 6&apos;s) when casting spells. However, if they roll a Miscast, they will count as having failed a
-Stupidity test.</description>
+      <description>Forest Goblin Shamans may re-roll one dice (except 1&apos;s) when casting spells. However, if they roll a miscast, they will also count as having failed a Stupidity test (if they survive).</description>
     </rule>
     <rule id="f44c-19e9-1d24-b925" name="Big Stabba" publicationId="9e23-79cb-pubN78975" page="122" hidden="false">
       <description>A unit of Savage Orcs may be upgraded to include Big Stabbas. A unit of Savage Orcs may be upgraded to include Big Stabbas. This is represented by upgrading two models and by including one or more Big Stabba models in the unit. A Big Stabba is mounted on two Infantry bases and must be placed to cover both the first and second rank of the unit, but is otherwise equipped like the rest of the unit. Each Big Stabba model causes D3 Impact Hits with Multple Wounds (D3). Big Stabbas are always the last models to be removed as casualties; the weapons are picked up by other Savage Orcs in the unit (excluding any Command Group models) should they be slain.</description>
@@ -13258,7 +13435,7 @@ Stupidity test.</description>
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 5+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="e2eb-d580-9bef-090d" name="Grunta" publicationId="9e23-79cb-pubN78975" page="118" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -13286,7 +13463,7 @@ Stupidity test.</description>
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 4+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="c731-a6d8-8750-c8e5" name="Wyvern" publicationId="9e23-79cb-pubN78975" page="179" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
diff --git a/Pirates_of_Sartosa.cat b/Pirates_of_Sartosa.cat
index ad4d4ea..2e68cbd 100644
--- a/Pirates_of_Sartosa.cat
+++ b/Pirates_of_Sartosa.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="c428-290d-c480-1dd1" name="Pirates of Sartosa" revision="5" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="4" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="c428-290d-c480-1dd1" name="Pirates of Sartosa" revision="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="d934-6883-3859-d0d0" name="Grog Lubber Table">
       <characteristicTypes>
@@ -736,7 +736,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -773,7 +774,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1550,7 +1552,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1587,7 +1590,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
diff --git a/Regiments_of_Renown.cat b/Regiments_of_Renown.cat
index 0e6990e..10b5e92 100644
--- a/Regiments_of_Renown.cat
+++ b/Regiments_of_Renown.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b68c-fa06-aafb-abce" name="Regiments of Renown" revision="3" 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|https://discordapp.com/invite/UrrPB3T" library="true" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="10" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b68c-fa06-aafb-abce" name="Regiments of Renown" revision="4" 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|https://discordapp.com/invite/UrrPB3T" library="true" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="5423-274f-5dcf-2680" name="Pick up and... Chart">
       <characteristicTypes>
@@ -1083,7 +1083,8 @@ order to march, regardless of the proximity of enemy units.</description>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -4791,7 +4792,7 @@ moves/fights normally this turn. On a roll of 1 the unit fails the test. To dete
               <infoLinks>
                 <infoLink id="2a02-8c4f-29e5-cc1b" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
                 <infoLink id="8897-55ab-177d-edcf" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
-                <infoLink id="302a-af8a-0ae0-7f27" name="Natural Armour (5+)" hidden="false" targetId="306d-711a-1300-587f" type="rule"/>
+                <infoLink id="302a-af8a-0ae0-7f27" name="Natural Armour (6+)" hidden="false" targetId="fa69-07b8-fdc1-3ac9" type="rule"/>
                 <infoLink id="2f25-05cd-d05f-94ea" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
                 <infoLink id="7520-dcc3-5c77-d29d" name="Horned one" hidden="false" targetId="0098-3e0d-ef68-bd84" type="profile"/>
               </infoLinks>
@@ -6893,8 +6894,7 @@ moves/fights normally this turn. On a roll of 1 the unit fails the test. To dete
 
 To see if a Giant falls over roll a D6. On a roll of 1, the Giant falls over. A slain Giant falls over automatically.
 
-To determine in which direction the Giant falls, roll a scatter dice. Any unit within 4&quot; of the direction the Giant falls suffers 2D6 S 6 Hits that have Multiple Wounds (D3), distributed as hits from shooting, though no single model may suffer more than 1 Hit – any excess Hits are ignored. If the unit is in combat and the Giant has fallen over whilst
-attempting to Jump Up and Down, wounds inflicted by a falling Giant count towards the combat result.
+To determine in which direction the Giant falls, roll a scatter dice. Any unit within 4&quot; of the direction the Giant falls suffers 2D6 S 6 Hits that have Multiple Wounds (D3), distributed as hits from shooting, though no single model may suffer more than 1 Hit – any excess Hits are ignored. If the unit is in combat and the Giant has fallen over whilst attempting to Jump Up and Down, wounds inflicted by a falling Giant count towards the combat result.
 
 A Giant that falls over automatically suffers 1 wound. If the Giant is in combat then this wound counts towards combat resolution.
 
@@ -6910,7 +6910,7 @@ Once on the ground (you may lie the model down if you wish) a Giant may get up i
       <description>Every time a unit with this rule fails a Break test, roll on the Mercenary Loyalty table and apply the results. This rule has no effect on a unit that is joined by the army&apos;s General, Paymaster or Merchant Prince.</description>
     </rule>
     <rule id="5d35-65df-80d7-b14f" name="Ancestral Grudge" publicationId="9e23-79cb-pubN116235" page="32" hidden="false">
-      <description>Dwarfs always have Hatred (Orcs &amp; Goblins) and Hatred (Skaven).</description>
+      <description>Dwarfs have Hatred (Orcs &amp; Goblins, Skaven, Hobgoblins).</description>
     </rule>
   </sharedRules>
   <sharedProfiles>
@@ -6944,21 +6944,16 @@ Once on the ground (you may lie the model down if you wish) a Giant may get up i
     </profile>
     <profile id="Result (Big Things Chart)" name="Result" publicationId="9e23-79cb-pubN116235" page="57" hidden="false" typeId="a254-26a2-8849-ab28" typeName="Big Things Chart">
       <characteristics>
-        <characteristic name="1" typeId="f6f5-de92-dfcc-e84c">Yell and Bawl: Neither the Giant nor models in contact with it actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points or more (if both sides have a Giant that Yells and Bawls, the combat is a draw). This result has no effect against Animated Constructs.</characteristic>
-        <characteristic name="2-4" typeId="3749-c1ee-3586-bf43">Thump with Club: The Giant brings down its club on a single model from the target unit that is in base
-contact. The target may attempt to avoid the blow by passing an I test (use the lowest if the model has several different values). If the test is failed, the model takes 2D3 wounds which Ignores Armour
-Saves. If a double is rolled the Giant&apos;s club embeds itself in the ground and the Giant cannot attack at all in
-the following round of the same combat whilst it recovers its weapon.</characteristic>
-        <characteristic name="5-6" typeId="e053-490d-b3f1-fb6d">&apos;Eadbutt: The Giant head-butts a single enemy model from the target unit, automatically inflicting D3 wounds which Ignores Armour Saves. If the victim is wounded but not slain, then it is dazed and loses all of
-its following attacks. If the target has not yet attacked in that combat round, it loses those attacks; if it has
-already attacked, then it loses the next round&apos;s attacks.</characteristic>
+        <characteristic name="1" typeId="f6f5-de92-dfcc-e84c">Yell and Bawl: Neither the Giant nor models in contact with it actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points or more. This result has no effect against Animated Constructs.</characteristic>
+        <characteristic name="2-4" typeId="3749-c1ee-3586-bf43">Thump with Club: The Giant brings down its club on a single model from the target unit that is in base contact. The target may attempt to avoid the blow by passing an I test (use the lowest if the model has several different values). If the test is failed, the model takes 2D3 wounds which Ignores Armour Saves. If a double is rolled the Giant&apos;s club embeds itself in the ground and the Giant cannot attack at all in the following round of the same combat whilst it recovers its weapon.</characteristic>
+        <characteristic name="5-6" typeId="e053-490d-b3f1-fb6d">&apos;Eadbutt: The Giant head-butts a single enemy model from the target unit, automatically inflicting D3 wounds which Ignores Armour Saves. If the victim is wounded but not slain, then it is dazed and loses all of its following attacks. If the target has not yet attacked in that combat round, it loses those attacks; if it has already attacked, then it loses the next round&apos;s attacks.</characteristic>
       </characteristics>
     </profile>
     <profile id="Result (Pick up and... Chart)" name="Result" publicationId="9e23-79cb-pubN116235" page="57" hidden="false" typeId="5423-274f-5dcf-2680" typeName="Pick up and... Chart">
       <characteristics>
         <characteristic name="1" typeId="0250-f69f-9d6e-a4e6">Stuff into Bag: The model is effectively removed as a casualty and can do nothing whilst in the bag, but if the Giant should be slain, any enemy trapped in its bag are freed at the end of the battle, and no longer counts as casualties.</characteristic>
         <characteristic name="2" typeId="1c82-db72-bc0f-2439">Throw Back into Combat: The victim is removed as a casualty, and D6 S 3 hits are inflicted on the unit (save as normal).</characteristic>
-        <characteristic name="3" typeId="7b03-8210-0c01-075d">Hurl: The victim is hurled into an enemy unit within 12&quot; of the Giant – randomly determine which. The victim is removed as a casualty, and the unit takes D6 S 3 hits (save as normal). Unsaved Wounds from these hits count towards the Giant&apos;s combat result. If no enemy units are in range, treat this as a Throw Back into Combat result instead.</characteristic>
+        <characteristic name="3" typeId="7b03-8210-0c01-075d">Hurl: The victim is hurled into an enemy unit within 12&quot; of the Giant – randomly determine which. The victim is removed as a casualty, and the unit takes D6 S 3 hits. Unsaved Wounds from these hits count towards the Giant&apos;s combat result. If no enemy units are in range, treat this as a Throw Back into Combat result instead.</characteristic>
         <characteristic name="4" typeId="b4e0-39ea-d3e2-8f64">Squash: The model is removed as a casualty.</characteristic>
         <characteristic name="5" typeId="7ca0-5878-b637-a79d">Eat: The model is removed as a casualty.</characteristic>
         <characteristic name="6" typeId="ec29-6a74-d626-bb74">Pick Another: Treat the attack as if the Giant had rolled the Stuff into Bag result, above, and then choose another victim. Roll again on this table to see what the Giant does with it.</characteristic>
@@ -6966,12 +6961,11 @@ already attacked, then it loses the next round&apos;s attacks.</characteristic>
     </profile>
     <profile id="Result (Small Things Chart)" name="Result" publicationId="9e23-79cb-pubN116235" page="57" hidden="false" typeId="41a2-25f8-254e-5586" typeName="Small Things Chart">
       <characteristics>
-        <characteristic name="1" typeId="77dd-b058-bcfc-c0a3">Yell and Bawl: Neither the Giant nor models in contact with him actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points (if both sides have a Giant that Yells and Bawls, the combat is a draw).</characteristic>
-        <characteristic name="2" typeId="662e-b36e-1161-024c">Jump Up and Down: The Giant jumps up and down on top of the enemy. Before he starts, the
-Giant must test to determine if he falls over. If he falls over, work out where he falls and calculate damage. Any wounds caused by the fall (on either side) count towards the combat result. If the Giant remains on his feet, the target unit sustains 2D6 S 7 hits. Work out damage and saves as usual.
+        <characteristic name="1" typeId="77dd-b058-bcfc-c0a3">Yell and Bawl: Neither the Giant nor models in contact with him actually fight if they have not already done so this round. The Giant&apos;s side automatically wins the combat by 2 points. This result has no effect against Animated Constructs.</characteristic>
+        <characteristic name="2" typeId="662e-b36e-1161-024c">Jump Up and Down: The Giant jumps up and down on top of the enemy. Before he starts, the Giant must test to determine if he falls over. If he falls over, work out where he falls and calculate damage. Any wounds caused by the fall (on either side) count towards the combat result. If the Giant remains on its none-too-nimble feet, it will inflict two Stomp attacks.
+
 Giants enjoy jumping up and down on their enemies so much that a Giant that does so in one combat round will automatically do so in the following round if he is able to, assuming that he did not fall over in the previous round. A Giant that starts to Jump Up and Down will therefore continue to do so on the same target until he falls over, the target is destroyed, or the combat ends.</characteristic>
-        <characteristic name="3" typeId="31a3-be08-ee3c-cb76">Pick Up and...: The Giant grabs a single model in base contact from the target unit (Giant
-player&apos;s choice). The target must make a single attack to try to fend off the Giant&apos;s clumsy hand. If this attack causes an unsaved wound, the Giant&apos;s attack fails. Otherwise, the Giant grabs the model and the player rolls a D6 on the Pick up and... Chart.</characteristic>
+        <characteristic name="3" typeId="31a3-be08-ee3c-cb76">Pick Up and...: The Giant grabs a single model in base contact from the target unit (Giant player&apos;s choice). The target must make a single attack to try to fend off the Giant&apos;s clumsy hand. If this attack causes an unsaved wound, the Giant&apos;s attack fails. Otherwise, the Giant grabs the model and the player rolls a D6 on the Pick up and... Chart.</characteristic>
         <characteristic name="4-6" typeId="5cac-0609-e3e7-bd96">Swing with club: The Giant fights using Random Attacks (2D6) this round.</characteristic>
       </characteristics>
     </profile>
diff --git a/Skaven.cat b/Skaven.cat
index d2640f1..c721ea1 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="6" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="7" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="28da-4dfe-fb43-8a0c" name="Skaven" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="2c06-e87d-1a85-d6a0" name="Ringing the Bell Table">
       <characteristicTypes>
@@ -199,7 +199,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -474,7 +475,8 @@ shut down, Boneripper cannot do anything at all, and in combat he will be hit au
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">^6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -810,7 +812,8 @@ shut down, Boneripper cannot do anything at all, and in combat he will be hit au
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -937,7 +940,8 @@ shut down, Boneripper cannot do anything at all, and in combat he will be hit au
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1149,7 +1153,8 @@ shut down, Boneripper cannot do anything at all, and in combat he will be hit au
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1348,7 +1353,8 @@ shut down, Boneripper cannot do anything at all, and in combat he will be hit au
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1498,6 +1504,7 @@ If the Screaming Bell suffers one or more wounds inflicted by a shooting attack
                 <infoLink id="46e2-1ae1-fd09-decf" name="Scurry Away!" hidden="false" targetId="45db-9bbc-8b3b-4865" type="rule"/>
                 <infoLink id="556f-8cd8-bf57-9198" name="Strength in Numbers" hidden="false" targetId="337b-11fe-1de2-0cd0" type="rule"/>
                 <infoLink id="5301-b879-c089-e796" name="War Litter" hidden="false" targetId="10d3-4214-04d0-7709" type="profile"/>
+                <infoLink id="1667-913e-d7ca-8f8b" name="War-Litter" hidden="false" targetId="03e2-1030-42c5-4223" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="35.0"/>
@@ -1698,9 +1705,10 @@ If the Screaming Bell suffers one or more wounds inflicted by a shooting attack
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7cd6-fc80-dbde-51e6" type="max"/>
               </constraints>
               <infoLinks>
-                <infoLink id="a3be-02ac-0bcb-e19e" name="Scurry Away!" hidden="false" targetId="45db-9bbc-8b3b-4865" type="rule"/>
+                <infoLink id="a3be-02ac-0bcb-e19e" name="War-Litter" hidden="false" targetId="03e2-1030-42c5-4223" type="rule"/>
                 <infoLink id="1101-a0a5-d3b1-5abc" name="Strength in Numbers" hidden="false" targetId="337b-11fe-1de2-0cd0" type="rule"/>
                 <infoLink id="2982-3f4e-8cab-5f4b" name="War Litter" hidden="false" targetId="10d3-4214-04d0-7709" type="profile"/>
+                <infoLink id="4820-acd4-f3a9-e2d6" name="Scurry Away!" hidden="false" targetId="45db-9bbc-8b3b-4865" type="rule"/>
               </infoLinks>
               <costs>
                 <cost name="pts" typeId="points" value="35.0"/>
@@ -1921,7 +1929,8 @@ If the Screaming Bell suffers one or more wounds inflicted by a shooting attack
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -2023,7 +2032,8 @@ If the Screaming Bell suffers one or more wounds inflicted by a shooting attack
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -2145,7 +2155,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -2275,7 +2286,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -2382,7 +2394,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -2500,7 +2513,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
               </characteristics>
             </profile>
           </profiles>
@@ -3090,7 +3104,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -3711,7 +3726,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3743,7 +3759,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3823,7 +3840,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
               </characteristics>
             </profile>
           </profiles>
@@ -4392,7 +4410,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -4424,7 +4443,8 @@ To throw the Scry-orb, place the small round template with its centre anywhere w
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -7276,7 +7296,8 @@ If you roll a misfire result something has gone awry. No more shots are fired th
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -8483,9 +8504,11 @@ If you roll a misfire result something has gone awry. No more shots are fired th
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="54cf-2a08-41ba-d5d9" type="max"/>
           </constraints>
-          <infoLinks>
-            <infoLink id="dc3b-42cc-ad59-db12" name="Infernal Bomb" hidden="false" targetId="98db-8be4-4b48-aece" type="rule"/>
-          </infoLinks>
+          <rules>
+            <rule id="370f-fe15-3cbe-8df4" name="Infernal Bomb" publicationId="4086-1ccd-f433-39a2" page="174" hidden="false">
+              <description>One use only. As long as he is not Hidden, an Assassin can place an Infernal Bomb anywhere along his Movement path during the Remaining Movement phase. Place a marker where the bomb is placed. You may choose to detonate the bomb at the start of any Movement sub-phase by rolling a D6. On a roll of 1, the Infernal Bomb is a dud and does not explode. On a 2+, the bomb will explode; place the large round template centred on the marker. Any model at the template&apos;s centre takes a single S 10 Hit with Multiple Wounds (D3). Any models touched by the template suffer a S 3 hit with Armour Piercing (1).</description>
+            </rule>
+          </rules>
           <costs>
             <cost name="pts" typeId="points" value="30.0"/>
           </costs>
@@ -8509,7 +8532,7 @@ If you roll a misfire result something has gone awry. No more shots are fired th
             <infoLink id="3efd-ed9f-3147-4167" name="Warpstone Stars" hidden="false" targetId="64b9-d9fa-e1c4-61ac" type="profile"/>
           </infoLinks>
           <costs>
-            <cost name="pts" typeId="points" value="30.0"/>
+            <cost name="pts" typeId="points" value="20.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="cad2-9164-e005-f183" name="Weeping Blades" page="" hidden="false" collective="false" import="true" type="upgrade">
@@ -8542,8 +8565,7 @@ If you roll a misfire result something has gone awry. No more shots are fired th
               <characteristics>
                 <characteristic name="Range" typeId="4285-3917-6bf9-348b">6&quot;</characteristic>
                 <characteristic name="Strength" typeId="a1a2-667b-2ec7-4ba7"/>
-                <characteristic name="Special Rules" typeId="ce2d-df6c-9271-a2f8">One use only. The bearer can throw the Brass Orb in the Shooting phase. Place the small round template with its centre anywhere within range of the character and in his line of sight. The template then scatters D6&quot;. Models touched by the template must take an I test or be removed as casualties, with no
-saves of any kind allowed. If a 1 is rolled, centre the template on the model throwing the globe.</characteristic>
+                <characteristic name="Special Rules" typeId="ce2d-df6c-9271-a2f8">One use only. The bearer can throw the Brass Orb in the Shooting phase. Place the small round template with its centre anywhere within range of the character and in his line of sight. The template then scatters D6&quot;. Models touched by the template must take an I test or be removed as casualties, with no saves of any kind allowed. If a 1 is rolled, centre the template on the model throwing the globe.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -8573,14 +8595,14 @@ saves of any kind allowed. If a 1 is rolled, centre the template on the model th
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aba6-b8f4-511d-e964" type="max"/>
           </constraints>
           <profiles>
-            <profile id="25a2-d286-763d-4f6b" name="Doomrocket" publicationId="4086-1ccd-f433-39a2" page="189" hidden="false" typeId="c119-42f4-2cbe-71a5" typeName="Magic Weapon">
+            <profile id="25a2-d286-763d-4f6b" name="Doomrocket" publicationId="4086-1ccd-f433-39a2" page="189" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
               <characteristics>
-                <characteristic name="Range" typeId="4285-3917-6bf9-348b"/>
-                <characteristic name="Strength" typeId="a1a2-667b-2ec7-4ba7"/>
-                <characteristic name="Special Rules" typeId="ce2d-df6c-9271-a2f8">A Doomrocket is fired like a Stone Thrower.</characteristic>
+                <characteristic name="Range" typeId="59f2-3142-82d5-4f43">36&quot;</characteristic>
+                <characteristic name="Strength" typeId="b80e-7dac-0dea-9add">5</characteristic>
+                <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Slow to Fire. One use only. A Doomrocket is fired like a Stone Thrower. In case a Misfire is rolled, roll a D6 and consult the Doomrocket Misfire chart. </characteristic>
               </characteristics>
             </profile>
-            <profile id="b003-d7fa-31eb-b018" name="Doomrocket" publicationId="4086-1ccd-f433-39a2" page="189" hidden="false" typeId="b92e-be72-3f49-ed20" typeName="Doomrocket Misfire Chart">
+            <profile id="b003-d7fa-31eb-b018" name="Result" publicationId="4086-1ccd-f433-39a2" page="189" hidden="false" typeId="b92e-be72-3f49-ed20" typeName="Doomrocket Misfire Chart">
               <characteristics>
                 <characteristic name="1" typeId="c233-d22f-6c3f-a9df">Thoooooom!: Place the template over the model that fired the rocket and resolve the blast as normal.</characteristic>
                 <characteristic name="2-5" typeId="6dbd-973e-bfe6-38e7">Stabilising Fin Lost: The template scatters 3D6&quot; from its original position. Resolve any hits as normal.</characteristic>
@@ -8588,14 +8610,6 @@ saves of any kind allowed. If a 1 is rolled, centre the template on the model th
 spot suffers a single S 5 hit.</characteristic>
               </characteristics>
             </profile>
-            <profile id="7040-6a63-afff-7a70" name="Doomrocket" publicationId="4086-1ccd-f433-39a2" page="189" 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">36&quot;</characteristic>
-                <characteristic name="Strength" typeId="6ca0-d074-628f-e276">5</characteristic>
-                <characteristic name="Special Rules" typeId="d3a4-721b-f750-5564">Slow to Fire. One use only. In case a Misfire is rolled, roll a D6 and consult the Doomrocket Misfire chart.</characteristic>
-              </characteristics>
-            </profile>
           </profiles>
           <costs>
             <cost name="pts" typeId="points" value="30.0"/>
@@ -8635,8 +8649,8 @@ spot suffers a single S 5 hit.</characteristic>
             <profile id="d1b4-930d-6cb8-db05" name="Warp-Blades" publicationId="4086-1ccd-f433-39a2" page="189" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
               <characteristics>
                 <characteristic name="Range" typeId="59f2-3142-82d5-4f43">Combat</characteristic>
-                <characteristic name="Strength" typeId="b80e-7dac-0dea-9add">+1</characteristic>
-                <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Warp-Blades give the bearer +1 to cast the Warp Lightning spell from the Lore of Ruin.</characteristic>
+                <characteristic name="Strength" typeId="b80e-7dac-0dea-9add"/>
+                <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Polearm. Warp-Blades give the bearer +1 to cast the Warp Lightning spell from the Lore of Ruin.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -8665,7 +8679,7 @@ spot suffers a single S 5 hit.</characteristic>
               <characteristics>
                 <characteristic name="Range" typeId="59f2-3142-82d5-4f43">Combat</characteristic>
                 <characteristic name="Strength" typeId="b80e-7dac-0dea-9add"/>
-                <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Ignores Armour Saves. Magical Attacks.</characteristic>
+                <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Hand weapon. Ignores Armour Saves. Magical Attacks.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -9088,9 +9102,6 @@ Roll an Artillery Dice to determine number of shots fired. After the first Artil
     <rule id="704f-9cc5-3947-3141" name="Smoke Bombs" publicationId="4086-1ccd-f433-39a2" page="174" hidden="false">
       <description>One use only. If a model equipped with Smoke Bombs breaks from combat he can choose to smash the bombs underfoot to slow the victors as they pursue. Before declaring to pursue, announce that the Smoke Bombs are being detonated. Any units pursuing this model roll one D6 less than normal this turn.</description>
     </rule>
-    <rule id="98db-8be4-4b48-aece" name="Infernal Bomb" publicationId="4086-1ccd-f433-39a2" page="174" hidden="false">
-      <description>One use only. As long as he is not Hidden, an Assassin can place an Infernal Bomb anywhere along his Movement path during the Remaining Movement phase. Place a marker where the bomb is placed. You may choose to detonate the bomb at the start of any Movement sub-phase by rolling a D6. On a roll of 1, the Infernal Bomb is a dud and does not explode. On a 2+, the bomb will explode; place the large round template centred on the marker. Any model at the template&apos;s centre takes a single S 10 Hit with Multiple Wounds (D3). Any models touched by the template suffer a S 3 hit with Armour Piercing (1).</description>
-    </rule>
     <rule id="60c7-e1cf-df2c-ae21" name="Skittering" publicationId="4086-1ccd-f433-39a2" page="203" hidden="false">
       <description>A model mounted on a Great Pox Rat is treated as an Infantry model for the purpose of &apos;Look Out, Sir!&apos;.</description>
     </rule>
@@ -9103,13 +9114,16 @@ Roll an Artillery Dice to determine number of shots fired. After the first Artil
     <rule id="b04e-f29c-8bc8-3beb" name="Gas Mask" publicationId="4086-1ccd-f433-39a2" page="191" hidden="false">
       <description>When a model with a Gas Mask is forced to take a T test from any weapon source in Warhammer: Skaven, they get a +2 bonus for these tests.</description>
     </rule>
+    <rule id="03e2-1030-42c5-4223" name="War-Litter" publicationId="4086-1ccd-f433-39a2" page="203" hidden="false">
+      <description>A War-litter should be placed on a 40x40mm base, and adds +4 to the Unit Strength of any model mounted on them.</description>
+    </rule>
   </sharedRules>
   <sharedProfiles>
     <profile id="5a0c-705e-808a-ca99" name="Warpmusket" publicationId="4086-1ccd-f433-39a2" page="189" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
       <characteristics>
-        <characteristic name="Range" typeId="59f2-3142-82d5-4f43">24&quot;</characteristic>
+        <characteristic name="Range" typeId="59f2-3142-82d5-4f43"/>
         <characteristic name="Strength" typeId="b80e-7dac-0dea-9add">5</characteristic>
-        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Move or Fire. Armour Piercing (1). Magical Attacks. Unstable Ammunition.</characteristic>
+        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Handgun. Magical Attacks. Unstable Ammunition.</characteristic>
       </characteristics>
     </profile>
     <profile id="0976-5ad1-1c64-7ceb" name="Warplock Pistol" publicationId="4086-1ccd-f433-39a2" page="144" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
diff --git a/Tomb_Kings.cat b/Tomb_Kings.cat
index 56342aa..9b6afb4 100644
--- a/Tomb_Kings.cat
+++ b/Tomb_Kings.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="5f0e-5e33-61a6-a2ee" name="Tomb Kings" revision="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="5f0e-5e33-61a6-a2ee" name="Tomb Kings" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="1948-df7e-0b86-9296" name="Entombed Beneath the Sands Mishap Table">
       <characteristicTypes>
@@ -203,7 +203,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -382,7 +383,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">5</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">5</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">7</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">3</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -589,7 +591,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -906,22 +909,6 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
               <constraints>
                 <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="8d34-d6f4-0e05-2611" type="max"/>
               </constraints>
-              <profiles>
-                <profile id="9b50-7f24-f1c4-e9f7" name="Sehenesmet" publicationId="feeb-1927-4a99-f849" page="112" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
-                  <characteristics>
-                    <characteristic name="M" typeId="09ad-18df-607b-1215">6</characteristic>
-                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">3</characteristic>
-                    <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">2</characteristic>
-                    <characteristic name="S" typeId="edd2-7979-54a4-6b35">6</characteristic>
-                    <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">5</characteristic>
-                    <characteristic name="W" typeId="27ee-0675-122f-a1b1">5</characteristic>
-                    <characteristic name="I" typeId="7cca-e51f-edc2-7322">3</characteristic>
-                    <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">4</characteristic>
-                    <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>
-                    <characteristic name="Type" typeId="13f9-a26b-05af-3459">Monster (Special Character)</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="3d0d-6ab4-92d5-7bd6" name="Towering" hidden="false" targetId="cf7e-179f-186f-8108" type="rule"/>
                 <infoLink id="a3f5-314b-320b-6ee7" name="Undead" hidden="false" targetId="3c14-eb0b-929e-502a" type="rule"/>
@@ -1409,7 +1396,8 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1443,7 +1431,8 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1539,6 +1528,18 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                         <cost name="pts" typeId="points" value="0.0"/>
                       </costs>
                     </selectionEntry>
+                    <selectionEntry id="0ab1-6b03-48b3-2cec" 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="9dea-ab05-a9df-bc0d" type="min"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="51ce-22e9-2fa6-48d9" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="fac9-2273-81a0-b7a5" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="0.0"/>
+                      </costs>
+                    </selectionEntry>
                   </selectionEntries>
                   <costs>
                     <cost name="pts" typeId="points" value="0.0"/>
@@ -1546,7 +1547,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 </selectionEntry>
               </selectionEntries>
               <costs>
-                <cost name="pts" typeId="points" value="130.0"/>
+                <cost name="pts" typeId="points" value="125.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2345,7 +2346,8 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2379,7 +2381,8 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2864,7 +2867,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="5995-5a2e-3275-c75a" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="144c-354b-edb4-06f7" name="Master of Arms" hidden="false" collective="false" import="true" type="upgrade">
@@ -2964,7 +2967,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="5ba4-3353-bbbb-d183" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="a530-8cae-d043-ad82" name="Master of Arrows" hidden="false" collective="false" import="true" type="upgrade">
@@ -3130,7 +3133,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="9f55-7882-4a52-fc77" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="8f1e-9fd9-602f-e6d8" name="Master of Horse" hidden="false" collective="false" import="true" type="upgrade">
@@ -3242,7 +3245,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="e4a7-4406-b9d5-7f98" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="1465-ecf2-ed2a-f8cc" name="Master of Scouts" hidden="false" collective="false" import="true" type="upgrade">
@@ -3406,7 +3409,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="abfb-8bd6-ea9b-f95b" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="0b8a-c448-f0a0-62eb" name="Master of Chariots" hidden="false" collective="false" import="true" type="upgrade">
@@ -3542,7 +3545,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="1f36-753b-794f-bc77" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="e5a7-f606-9caa-c37c" name="Master of Scouts" hidden="false" collective="false" import="true" type="upgrade">
@@ -3658,7 +3661,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="53f1-5c04-c9ee-d1b2" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="43b6-3217-9ea8-444e" name="Master of Arms" hidden="false" collective="false" import="true" type="upgrade">
@@ -3797,7 +3800,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="1ded-72a1-39e3-f9f6" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="8052-1e41-74cb-e013" name="Master of Scouts" hidden="false" collective="false" import="true" type="upgrade">
@@ -3954,7 +3957,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="eaa2-c6c4-9f7b-fa98" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="58e6-9f4c-5b4c-0ae8" name="Master of Chariots" hidden="false" collective="false" import="true" type="upgrade">
@@ -4084,7 +4087,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="cf2c-ebfb-d3d8-5209" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="cd10-ea8f-7998-04ad" name="Master of Horse" hidden="false" collective="false" import="true" type="upgrade">
@@ -4210,7 +4213,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="c5fe-9475-5378-3dfe" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="4ea1-ed62-7119-c5e2" name="Master of Scouts" hidden="false" collective="false" import="true" type="upgrade">
@@ -4335,7 +4338,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="24f4-4e3a-306c-9c48" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="7c7e-2a16-5d90-4f81" name="Tomb Captain" hidden="false" collective="false" import="true" type="upgrade">
@@ -4467,7 +4470,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="dd0f-3d8c-08f8-5ece" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="e9c0-b15c-b69b-df6e" name="Tomb Captain" hidden="false" collective="false" import="true" type="upgrade">
@@ -4610,7 +4613,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="6957-8ffc-c006-3e14" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="6046-67f3-f6da-2806" name="Necropolis Captain" hidden="false" collective="false" import="true" type="upgrade">
@@ -4760,7 +4763,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="95ae-76f3-189f-6b32" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="0db0-f595-9300-10a3" name="Necropolis Captain" hidden="false" collective="false" import="true" type="upgrade">
@@ -5416,7 +5419,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <infoLink id="cefb-f2ee-a22d-de3e" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="f731-644e-7b63-5087" name="Master of Arrows" hidden="false" collective="false" import="true" type="upgrade">
@@ -5953,6 +5956,18 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="9ed4-a1a8-7876-74ee" 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="a4af-5812-ff57-c8d2" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1e48-aaaf-efe4-1805" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="adce-5a4d-12c5-4bea" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -5960,7 +5975,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="130.0"/>
+        <cost name="pts" typeId="points" value="125.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c461-cc29-9925-59d9" name="Tomb Barque of Usirian (Sehenesmet)" hidden="true" collective="false" import="true" type="model">
@@ -6021,6 +6036,18 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="d5f1-68e1-9e48-ec64" 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="b7ac-c312-fa18-d5dd" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1b25-085b-724f-228f" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="73b4-ae54-0d41-2422" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -6028,7 +6055,7 @@ Roll an Artillery dice to determine the number of hits caused. If a Misfire is r
         </selectionEntry>
       </selectionEntries>
       <costs>
-        <cost name="pts" typeId="points" value="130.0"/>
+        <cost name="pts" typeId="points" value="125.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a9f0-cda3-94b6-80ed" name="Khemrian Warsphinx" hidden="false" collective="false" import="true" type="model">
@@ -7136,18 +7163,20 @@ The Hierophant, and all models in the same unit, have Regeneration (6+).
 
 At the end of the phase in which the Hierophant is removed as a casualty, and at the start of every friendly turn thereafter, all friendly Undead units (except characters) on the battlefield must take a LD test. If the test is failed, the unit immediately suffers a number of Wounds equal to the amount by which it failed the LD test, with no saves of any kind allowed. These Wounds are distributed as if from a shooting attack.
 
-If, at the start of any of your turns following the death of the Hierophant, there is one or more friendly Wizards on the table who know spells from the Lore of Nehekhara, then one of these models may be designated the new Hierophant by passing a LD test. If passed, he becomes the new Hierophant following all the normal rules, and no unit in the army needs to take the LD test to avoid losing Wounds while he remains alive.</description>
+If, at the start of any of your turns following the death of the Hierophant, there is one or more friendly Wizard Characters on the table who know spells from the Lore of Nehekhara, then one of these models may be designated the new Hierophant by passing a LD test. If passed, he becomes the new Hierophant following all the normal rules, and no unit in the army needs to take the LD test to avoid losing Wounds while he remains alive.</description>
     </rule>
     <rule id="eb9b-8590-beba-94b0" name="Entombed Beneath the Sands" publicationId="feeb-1927-4a99-f849" page="69" hidden="false">
       <description>A unit with this ability has Ambushers, with the following exceptions.
 
 When these units enter the battle in the Remaining Moves sub-phase, they do not move onto the board as reinforcements in the normal way. Instead, when a unit that is Entombed Beneath the Sands enters the battle, place a small marker (such as a coin) anywhere on the battlefield, but not in impassable terrain or within 1&quot; of a deployed unit.
 
-Roll a scatter dice and an artillery dice. If you roll a Hit on the scatter dice, the marker stays in place. If you roll an arrow, move the marker the number, in inches, indicated by the artillery dice in the direction shown. If the marker is under a unit (friend or foe), impassable terrain or a building, place it 1&quot; away from the closest edge of the unit/terrain.
+Roll a scatter dice and an artillery dice. If you roll a Hit on the scatter dice, the marker stays in place. If you roll an arrow, move the marker the number, in inches, indicated by the artillery dice in the direction shown. If the marker is under a friendly unit, impassable terrain or a building, place it 1&quot; away from the closest edge of the unit/terrain.
 
-Once the final position of the marker is established, place the emerging unit in a legal formation such that it touches the marker, facing any direction. If you roll a misfire, or if for any reason some of the models in the unit cannot be placed, then the unit does not emerge. Instead, remove the marker and roll on the Mishap table. If a unit emerges successfully, it may act normally this turn.
+Once the final position of the marker is established, place the emerging unit in a legal formation such that it touches the marker, facing any direction. If the marker is under an enemy unit, you may place your unit into base contact with the enemy unit in any arc of your choosing; your unit will counts as charging this turn.
 
-Only characters that are Entombed Beneath the Sands can be deployed within such units. If you have several units Entombed Beneath the Sands, then repeat this process, one unit at a time.</description>
+If you roll a misfire, or if for any reason some of the models in the unit cannot be placed, then the unit does not emerge. Instead, remove the marker and roll on the Mishap table. If a unit emerges successfully, it may act normally this turn.
+
+Only characters that have Entombed Beneath the Sands can be deployed within such units. If you have several units Entombed Beneath the Sands, then repeat this process, one unit at a time.</description>
     </rule>
     <rule id="d00e-1ed4-0408-e5e8" name="Arrows of Asaph" publicationId="feeb-1927-4a99-f849" page="69" hidden="false">
       <description>Units with Arrows of Asaph never count any bonuses or penalties to hit when shooting, regardless of the source of the modifier.</description>
@@ -7313,7 +7342,7 @@ If all characters with My Will Be Done in the unit are killed, the unit immediat
         <characteristic name="1-2" typeId="150e-54b9-ccf9-3a93">Reaping Blades: The Khemric Titan inflicts D6 S 6 hits on the enemy unit.</characteristic>
         <characteristic name="3" typeId="d548-6cd8-4463-d258">Flesh-eating Scarabs: The Khemric Titan inflicts 3D6 S 2 hits on the enemy unit.</characteristic>
         <characteristic name="4" typeId="2f9e-a735-e002-5c72">Breath of the Night: The Khemric Titan does not attack, but instead automatically wins the combat with a combat resolution of 2 (unless this would be higher from other sources).</characteristic>
-        <characteristic name="5" typeId="64eb-0812-20b6-4cd6">Devouring Jaws: The Khemric Titan picks a single model in base contact. That models suffers a single S 6 hit with Heroic Killing Blow.</characteristic>
+        <characteristic name="5" typeId="64eb-0812-20b6-4cd6">Devouring Jaws: The Khemric Titan inflicts a S 6 hit with Heroic Killing Blow on all enemy models in base contact.</characteristic>
         <characteristic name="6" typeId="b9b0-397a-b58f-ba10">Soul Slaying Hunger: The Khemric Titan inflicts 2D6 hits on the enemy. Roll a D6 for each hit, on a 5+ it inflicts a Wound with no armour saves allowed and Multiple Wounds (D3). This is a Magical Attack.</characteristic>
       </characteristics>
     </profile>
@@ -7370,7 +7399,7 @@ If all characters with My Will Be Done in the unit are killed, the unit immediat
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 4+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="Skeletal Crew Tomb Barque" name="Skeleton Crew" publicationId="feeb-1927-4a99-f849" page="84" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -7699,8 +7728,9 @@ If all characters with My Will Be Done in the unit are killed, the unit immediat
       <characteristics>
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
-        <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+        <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e"></characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
       </characteristics>
     </profile>
     <profile id="9002-f9e2-3e64-d02b" name="Ammut" publicationId="feeb-1927-4a99-f849" page="90" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -7862,7 +7892,8 @@ If all characters with My Will Be Done in the unit are killed, the unit immediat
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
       </characteristics>
     </profile>
     <profile id="451a-1400-2bdd-75b4" name="Sehenesmet" publicationId="feeb-1927-4a99-f849" page="117" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
diff --git a/Vampire_Counts.cat b/Vampire_Counts.cat
index c62fa70..bc38404 100644
--- a/Vampire_Counts.cat
+++ b/Vampire_Counts.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="335c-7873-eaf3-a60a" name="Vampire Counts" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="335c-7873-eaf3-a60a" name="Vampire Counts" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="9a0e-261d-9899-f1ae" name="Evocation of Death Chart">
       <characteristicTypes>
@@ -139,7 +139,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -265,7 +266,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -577,7 +579,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -893,7 +896,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1079,7 +1083,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1311,7 +1316,8 @@ The last two effects last until the start of the next Vampire Counts&apos; turn.
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1543,7 +1549,8 @@ The last two effects last until the start of the next Vampire Counts&apos; turn.
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1746,7 +1753,8 @@ The last two effects last until the start of the next Vampire Counts&apos; turn.
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1860,7 +1868,8 @@ the beginning of his next turn.</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1969,7 +1978,8 @@ the beginning of his next turn.</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -2158,7 +2168,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -2192,7 +2203,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -2357,8 +2369,8 @@ the beginning of his next turn.</characteristic>
                         <infoLink id="f332-d510-d20a-0a36" name="Undead" hidden="false" targetId="c34e-cef6-4d1c-ae41" type="rule"/>
                         <infoLink id="ccdc-9b67-cb29-c890" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="bb6c-ed32-e170-0965" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
-                        <infoLink id="d253-6c65-f34f-6b4a" name="Nightmare" hidden="false" targetId="1028-e8c0-ed9b-343b" type="profile"/>
                         <infoLink id="e9e7-ccdb-af6e-9f03" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
+                        <infoLink id="67b3-efe0-8b14-6a6b" name="Hellsteed" hidden="false" targetId="43c3-7b6b-5d57-c78e" type="profile"/>
                       </infoLinks>
                       <costs>
                         <cost name="pts" typeId="points" value="30.0"/>
@@ -2510,7 +2522,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -2546,7 +2559,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -2614,8 +2628,8 @@ the beginning of his next turn.</characteristic>
                         <infoLink id="e4f3-83ef-a62c-4d8d" name="Undead" hidden="false" targetId="c34e-cef6-4d1c-ae41" type="rule"/>
                         <infoLink id="fc3b-9962-e212-5e92" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="0371-1d68-5f35-f0f3" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
-                        <infoLink id="9f03-25eb-4b3d-3066" name="Nightmare" hidden="false" targetId="1028-e8c0-ed9b-343b" type="profile"/>
                         <infoLink id="92a6-c381-57a1-2bad" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
+                        <infoLink id="57b7-11a7-3690-f582" name="Hellsteed" hidden="false" targetId="43c3-7b6b-5d57-c78e" type="profile"/>
                       </infoLinks>
                       <costs>
                         <cost name="pts" typeId="points" value="30.0"/>
@@ -2777,7 +2791,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -2811,7 +2826,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -2907,8 +2923,8 @@ the beginning of his next turn.</characteristic>
                         <infoLink id="46c5-3501-c302-51cc" name="Undead" hidden="false" targetId="c34e-cef6-4d1c-ae41" type="rule"/>
                         <infoLink id="3486-0586-aaaa-db46" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="75df-c506-b95d-315c" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
-                        <infoLink id="d2af-ee09-b060-233f" name="Nightmare" hidden="false" targetId="1028-e8c0-ed9b-343b" type="profile"/>
                         <infoLink id="b9a9-9369-928c-aacc" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
+                        <infoLink id="a214-401f-361f-316e" name="Hellsteed" hidden="false" targetId="43c3-7b6b-5d57-c78e" type="profile"/>
                       </infoLinks>
                       <costs>
                         <cost name="pts" typeId="points" value="30.0"/>
@@ -3070,7 +3086,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3104,7 +3121,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3229,8 +3247,8 @@ the beginning of his next turn.</characteristic>
                         <infoLink id="b1d2-ab38-67e8-2e1e" name="Undead" hidden="false" targetId="c34e-cef6-4d1c-ae41" type="rule"/>
                         <infoLink id="69d2-f20c-a9ff-b9de" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="d0a4-3335-b19a-80bb" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
-                        <infoLink id="77c7-a5a8-4219-28b6" name="Nightmare" hidden="false" targetId="1028-e8c0-ed9b-343b" type="profile"/>
                         <infoLink id="aa5a-39fd-0518-692e" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
+                        <infoLink id="797e-4fb1-0b98-13b2" name="Hellsteed" hidden="false" targetId="43c3-7b6b-5d57-c78e" type="profile"/>
                       </infoLinks>
                       <costs>
                         <cost name="pts" typeId="points" value="30.0"/>
@@ -3417,7 +3435,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3451,7 +3470,8 @@ the beginning of his next turn.</characteristic>
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -3575,7 +3595,8 @@ the beginning of his next turn.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3608,7 +3629,8 @@ the beginning of his next turn.</characteristic>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -3862,7 +3884,8 @@ the beginning of his next turn.</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -4187,7 +4210,8 @@ the beginning of his next turn.</characteristic>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -4412,7 +4436,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -4633,7 +4658,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4667,7 +4693,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -4832,8 +4859,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                         <infoLink id="d1ed-e053-d2ac-dc78" name="Undead" hidden="false" targetId="c34e-cef6-4d1c-ae41" type="rule"/>
                         <infoLink id="14b8-423d-28dc-f3e7" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="f587-5a6b-1673-3770" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
-                        <infoLink id="3773-6ed3-ae62-d96f" name="Nightmare" hidden="false" targetId="1028-e8c0-ed9b-343b" type="profile"/>
                         <infoLink id="b276-ac71-1358-15b6" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
+                        <infoLink id="9712-91d8-5f41-3138" name="Hellsteed" hidden="false" targetId="43c3-7b6b-5d57-c78e" type="profile"/>
                       </infoLinks>
                       <costs>
                         <cost name="pts" typeId="points" value="30.0"/>
@@ -5005,7 +5032,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5041,7 +5069,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5109,8 +5138,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                         <infoLink id="74ab-3b99-31a2-ac78" name="Undead" hidden="false" targetId="c34e-cef6-4d1c-ae41" type="rule"/>
                         <infoLink id="600d-9d45-55b8-c95c" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="d953-235a-a597-4a9e" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
-                        <infoLink id="14da-0b0e-2db9-00b4" name="Nightmare" hidden="false" targetId="1028-e8c0-ed9b-343b" type="profile"/>
                         <infoLink id="3a2a-a52c-5149-00e8" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
+                        <infoLink id="f33a-6fc8-08bd-b091" name="Hellsteed" hidden="false" targetId="43c3-7b6b-5d57-c78e" type="profile"/>
                       </infoLinks>
                       <costs>
                         <cost name="pts" typeId="points" value="30.0"/>
@@ -5336,7 +5365,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5370,7 +5400,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                             <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                             <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                             <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                            <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                            <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                            <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                           </characteristics>
                         </profile>
                       </profiles>
@@ -5466,8 +5497,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                         <infoLink id="5e9e-6f00-e0ad-c018" name="Undead" hidden="false" targetId="c34e-cef6-4d1c-ae41" type="rule"/>
                         <infoLink id="d63b-fe90-37aa-4753" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="e3a0-d46c-59fb-822b" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
-                        <infoLink id="91be-8756-8c70-e768" name="Nightmare" hidden="false" targetId="1028-e8c0-ed9b-343b" type="profile"/>
                         <infoLink id="8417-9ede-134f-56d5" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
+                        <infoLink id="3212-34d6-ee1f-3a82" name="Hellsteed" hidden="false" targetId="43c3-7b6b-5d57-c78e" type="profile"/>
                       </infoLinks>
                       <costs>
                         <cost name="pts" typeId="points" value="30.0"/>
@@ -5643,7 +5674,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -5768,7 +5800,7 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                         <infoLink id="61ac-cfae-0cbf-94d4" name="Undead" hidden="false" targetId="c34e-cef6-4d1c-ae41" type="rule"/>
                         <infoLink id="e5a2-5c30-80fb-d8c7" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                         <infoLink id="b894-d9b5-e5eb-0d6f" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
-                        <infoLink id="7494-3161-8b77-d877" name="Nightmare" hidden="false" targetId="1028-e8c0-ed9b-343b" type="profile"/>
+                        <infoLink id="7494-3161-8b77-d877" name="Hellsteed" hidden="false" targetId="43c3-7b6b-5d57-c78e" type="profile"/>
                         <infoLink id="2dc1-7476-1e9a-7fe7" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
                       </infoLinks>
                       <costs>
@@ -5966,7 +5998,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -6133,7 +6166,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -6166,7 +6200,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -7183,15 +7218,16 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                     <cost name="pts" typeId="points" value="1.0"/>
                   </costs>
                 </selectionEntry>
-                <selectionEntry id="0198-e3a6-2cdc-af14" name="Spear (Infantry)" hidden="false" collective="true" import="true" type="upgrade">
+                <selectionEntry id="0198-e3a6-2cdc-af14" name="Spear (Infantry) &amp; 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="90e5-2211-8f17-2d04" type="max"/>
                   </constraints>
                   <infoLinks>
-                    <infoLink id="f1d7-fbed-b5c5-5891" name="Spear (Infantry)" hidden="false" targetId="be39-37ac-ac20-5053" type="profile"/>
+                    <infoLink id="f1d7-fbed-b5c5-5891" name="Shield" hidden="false" targetId="8bf1-244f-c642-d43f" type="profile"/>
+                    <infoLink id="bbb7-4eed-1964-7b1d" name="Spear (Infantry)" hidden="false" targetId="be39-37ac-ac20-5053" type="profile"/>
                   </infoLinks>
                   <costs>
-                    <cost name="pts" typeId="points" value="1.0"/>
+                    <cost name="pts" typeId="points" value="2.0"/>
                   </costs>
                 </selectionEntry>
                 <selectionEntry id="cdf5-81a5-53df-53b8" name="Hand Weapon" hidden="false" collective="true" import="true" type="upgrade">
@@ -8988,7 +9024,8 @@ armour save, that magic weapon&apos;s abilities are nullified; it is treated as
                         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -10132,7 +10169,7 @@ If, at the start of any of your turns following the death of the General, there
       <description>All Wizards (friend or foe) within 12&quot; of one or more models with a Blasphemous Tome gain +2 to their casting result when casting spells from the Lore of Necromancy. If any Wizard miscasts within 12&quot; of one or more models with a Blasphemous Tome upgrade, they must roll twice on the Miscast table. The miscasting player&apos;s opponent chooses which result applies.</description>
     </rule>
     <rule id="65af-deb9-9d8b-bedf" name="Battle of Wills" publicationId="10a5-5781-61f5-86ae" page="204" hidden="false">
-      <description>Immediately before the first model in an enemy unit rolls To Hit against the Coven Throne or a character upon it (either in close combat or shooting), the opponent must roll a D6 and add it to his unit&apos;s LD (attacks that do not roll To Hit are exempt from this effect). Next, roll a D6 and add it to the Coven Throne&apos;s LD. To find the result of the Battle of Wills, subtract the enemy&apos;s total from the Coven Throne&apos;s total, and apply the result to the Battle of Wills Table.</description>
+      <description>Immediately before the first model in an enemy unit rolls To Hit against the Coven Throne or a character upon it (either in close combat or shooting), the opponent must roll a D6 and add it to his unit&apos;s LD (attacks that do not roll To Hit are exempt from this effect). Next, roll a D6 and add it to the Coven Throne&apos;s LD. To find the result of the Battle of Wills, subtract the enemy&apos;s total from the Coven Throne&apos;s total, and apply the result to the Battle of Wills Table. Battle of Wills has no effect against models with Immunity (Psychology).</description>
     </rule>
     <rule id="515e-c009-6cec-66aa" name="Death Shriek" publicationId="10a5-5781-61f5-86ae" page="207" hidden="false">
       <description>A Death Shriek is a special attack that can be used against a single unit in the Shooting phase, even if the Terrorgheist has marched, charged, or is engaged in close combat. This attack has a range of 8&quot; and needs line of sight to its target. If the Terrorgheist is engaged in combat, its Death Shriek may target a unit in base contact.
@@ -10356,9 +10393,9 @@ To resolve a Death Shriek, roll 2D6 and add the number of Wounds the Terrorgheis
         <characteristic name="BS" typeId="7b67-9dfa-eeac-d007"/>
         <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
         <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
-        <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
+        <characteristic name="W" typeId="27ee-0675-122f-a1b1">2</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">3</characteristic>
         <characteristic name="Type" typeId="13f9-a26b-05af-3459">War Beast</characteristic>
       </characteristics>
diff --git a/Warhammer_Armies_Project.gst b/Warhammer_Armies_Project.gst
index d05a813..2c9aa3e 100644
--- a/Warhammer_Armies_Project.gst
+++ b/Warhammer_Armies_Project.gst
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="9e23-79cb-afed-cf4c" name="Warhammer Armies Project" 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|https://discordapp.com/invite/UrrPB3T" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
+<gameSystem id="9e23-79cb-afed-cf4c" name="Warhammer Armies Project" 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|https://discordapp.com/invite/UrrPB3T" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
   <publications>
     <publication id="9e23-79cb-pubN66727" name="Rulebook v.1.81"/>
     <publication id="9e23-79cb-pubN67565" name="Albion v.1.24"/>
-    <publication id="9e23-79cb-pubN71963" name="Beastmen v.1.34"/>
+    <publication id="9e23-79cb-pubN71963" name="Beastmen v.1.36"/>
     <publication id="9e23-79cb-pubN75312" name="Bretonnia v.1.22"/>
-    <publication id="9e23-79cb-pubN76150" name="Dark Elves v.1.32"/>
-    <publication id="9e23-79cb-pubN77092" name="High Elves v.1.21"/>
-    <publication id="9e23-79cb-pubN77402" name="Lizardmen v.1.22"/>
-    <publication id="9e23-79cb-pubN78137" name="Ogre Kingdoms v.1.21"/>
-    <publication id="9e23-79cb-pubN78975" name="Orcs &amp; Goblins v.1.22"/>
-    <publication id="9e23-79cb-pubN116235" name="Regiments of Renown v.1.12"/>
-    <publication id="aa7b-3583-0834-7bfa" name="Dwarfs v.1.21"/>
-    <publication id="b3a3-a398-4838-11a1" name="Empire Knightly Orders v.1.11"/>
+    <publication id="9e23-79cb-pubN76150" name="Dark Elves v.1.33"/>
+    <publication id="9e23-79cb-pubN77092" name="High Elves v.1.22"/>
+    <publication id="9e23-79cb-pubN77402" name="Lizardmen v.1.23"/>
+    <publication id="9e23-79cb-pubN78137" name="Ogre Kingdoms v.1.22"/>
+    <publication id="9e23-79cb-pubN78975" name="Orcs &amp; Goblins v.1.23"/>
+    <publication id="9e23-79cb-pubN116235" name="Regiments of Renown v.1.13"/>
+    <publication id="aa7b-3583-0834-7bfa" name="Dwarfs v.1.22"/>
+    <publication id="b3a3-a398-4838-11a1" name="Empire Knightly Orders v.1.12"/>
     <publication id="d69c-a7ea-95db-6f56" name="Steam Tanks"/>
-    <publication id="315d-135b-135c-07ce" name="Empire v.1.21"/>
-    <publication id="4086-1ccd-f433-39a2" name="Skaven v.1.51"/>
+    <publication id="315d-135b-135c-07ce" name="Empire v.1.22"/>
+    <publication id="4086-1ccd-f433-39a2" name="Skaven v.1.53"/>
     <publication id="ee54-3543-b9db-fe40" name="Daemons of Chaos v.1.23"/>
-    <publication id="b724-d2c4-d151-2d9e" name="High Elves v.1.21, Lizardmen v.1.22"/>
-    <publication id="eee5-f9c5-fa08-3f2e" name="Beastmen v.1.34, Daemons of Chaos v.1.23, Warriors of Chaos v.1.21"/>
-    <publication id="feeb-1927-4a99-f849" name="Tomb Kings v.1.2"/>
-    <publication id="10a5-5781-61f5-86ae" name="Vampire Counts v.1.22"/>
-    <publication id="1a01-044f-047b-618f" name="Warriors of Chaos v.1.21"/>
-    <publication id="bb4b-874f-580a-13d6" name="Beastmen v.1.34, Warriors of Chaos v.1.21"/>
-    <publication id="e967-620f-06be-096a" name="Wood Elves v.1.12"/>
+    <publication id="b724-d2c4-d151-2d9e" name="High Elves v.1.22, Lizardmen v.1.23"/>
+    <publication id="eee5-f9c5-fa08-3f2e" name="Beastmen v.1.36, Daemons of Chaos v.1.23, Warriors of Chaos v.1.21"/>
+    <publication id="feeb-1927-4a99-f849" name="Tomb Kings v.1.22"/>
+    <publication id="10a5-5781-61f5-86ae" name="Vampire Counts v.1.23"/>
+    <publication id="1a01-044f-047b-618f" name="Warriors of Chaos v.1.22"/>
+    <publication id="bb4b-874f-580a-13d6" name="Beastmen v.1.36, Warriors of Chaos v.1.21"/>
+    <publication id="e967-620f-06be-096a" name="Wood Elves v.1.21"/>
     <publication id="315c-6fd1-56a3-8b04" name="Amazons v.1.12"/>
     <publication id="d221-484d-439d-4310" name="Araby v.1.24"/>
     <publication id="8abe-59b3-1084-5e51" name="Cathay v.1.13"/>
-    <publication id="faf5-2026-3cea-6e96" name="Chaos Dwarfs v.1.21"/>
+    <publication id="faf5-2026-3cea-6e96" name="Chaos Dwarfs v.1.23"/>
     <publication id="7f0c-7d47-a39d-8c68" name="Cult of Ulric"/>
-    <publication id="8ada-88a0-cdcd-9b5e" name="Dogs of War v.1.13"/>
+    <publication id="8ada-88a0-cdcd-9b5e" name="Dogs of War v.1.14"/>
     <publication id="894a-5ecc-1ff7-958a" name="Estalia"/>
     <publication id="0545-ea23-873c-f668" name="Halflings"/>
     <publication id="92f3-84a1-4644-bc2f" name="Hobgoblins"/>
@@ -105,7 +105,8 @@
         <characteristicType id="7f8d-5707-7251-c1a5" name="Wizard Level"/>
         <characteristicType id="b859-9e7c-9452-f90e" name="Known Spells"/>
         <characteristicType id="c5a7-d8e1-9c88-2f0e" name="Spell Level"/>
-        <characteristicType id="d5d5-4c2e-491e-474a" name="Bonus to Casting/Dispel Value"/>
+        <characteristicType id="d5d5-4c2e-491e-474a" name="Max. Power Dice Per Spell"/>
+        <characteristicType id="7261-e23f-ab6d-b4af" name="Bonus to Casting/Dispel Value"/>
       </characteristicTypes>
     </profileType>
     <profileType id="781d-35fe-dd22-05d6" name="War Machine">
@@ -2188,7 +2189,7 @@ If a unit includes a standard bearer, it adds +1 to its combat result. </descrip
 The side that has a musician in its front rank of one or more of its units wins any drawn close combat by 1, unless the opposing side has a musician also, in which case they cancel each other out.
 
 &quot;Form on Me!&quot;
-If a fleeing unit has a musician, it may re-roll its LD test whenever itattempts to rally.
+If a fleeing unit has a musician, it may re-roll its LD test whenever it attempts to rally.
 
 Swift Reform
 A unit that is not fleeing and not engaged in combat can make a swift reform during the Remaining Moves sub-phase if it has a musician. A swift reform is treated exactly like a reform manoeuvre, however the following exceptions apply:
diff --git a/Warriors_of_Chaos.cat b/Warriors_of_Chaos.cat
index 843516f..e939e55 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="7" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="d5f5-ad84-7e47-d02e" name="Warriors of Chaos" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="8" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="1306-7f01-ae3c-4fa0" name="Eye of the Gods Table">
       <characteristicTypes>
@@ -177,7 +177,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -475,7 +476,8 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -926,7 +928,8 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1138,6 +1141,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="9f56-b05e-41b3-088d" name="Full Plate Armour" 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="59e7-2a4b-5aa0-ca7d" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a2e3-f8ea-2eaf-5cdd" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="3063-6d4d-53cf-c700" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -1206,6 +1221,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="3344-3ae4-2ea3-8712" name="Full Plate Armour" 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="89b8-5e5c-fa25-068d" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="25e8-821d-bd58-a5c9" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="a0a1-f0b4-4bb3-0392" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -1601,6 +1628,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="6db4-eba8-13f1-6aef" name="Full Plate Armour" 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="638f-777f-854d-7613" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b22d-bec7-cacf-d2e8" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="7e4b-eb64-5d08-db81" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -1669,6 +1708,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="d741-719c-4e88-54d2" name="Full Plate Armour" 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="9250-c910-f64d-9cf2" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="edb1-fdb0-3690-918d" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="ae50-c0b0-ca7f-93e8" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -2064,6 +2115,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="d567-bd05-6c26-4a03" name="Full Plate Armour" 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="713f-367b-11a0-c910" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b2f-9030-e4e6-5416" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="9bf4-448a-d844-01bf" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -2132,6 +2195,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="5522-f409-f302-dab2" name="Full Plate Armour" 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="03f1-4262-76ea-4585" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="65d9-c587-12a3-6226" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="d098-b108-6031-decf" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -2524,6 +2599,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="7bca-62ff-dcd9-f635" name="Full Plate Armour" 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="c167-cb8b-5d92-8fe7" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ea0c-18de-9575-4117" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="9562-1ca8-7eb8-d006" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -2591,6 +2678,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="98ee-155e-6616-0249" name="Full Plate Armour" 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="a823-2051-99c9-d142" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9282-3e00-c15d-a697" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="ced4-cf68-3715-ebdb" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -2969,6 +3068,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="4e7a-a45a-cea9-faf4" name="Full Plate Armour" 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="7b29-1cb6-8897-5b27" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="82ec-3493-9352-3083" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="c2f2-4681-edbd-742c" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -3037,6 +3148,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="96ef-fd2f-ef59-f99b" name="Full Plate Armour" 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="2176-f8ce-4c8d-a1ec" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2fa7-1a86-e5ca-c478" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="4474-4eb5-7866-03d8" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -3283,7 +3406,7 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <infoLink id="1ca3-04db-f390-9106" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="bffa-0b6b-6eb9-720e" name="Daemonic" hidden="false" targetId="a6d9-b8e9-21b2-96ff" type="rule"/>
                 <infoLink id="9600-3632-e640-3bcd" name="Daemon Prince" hidden="false" targetId="b6a9-0fe9-848a-2d66" type="profile"/>
-                <infoLink id="4ee7-20da-1087-44d0" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
+                <infoLink id="891d-d8b0-9d6c-c4f3" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="0330-d62e-42fc-9edb" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -3466,7 +3589,7 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <infoLink id="e9f8-a961-e52e-2029" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="3c5b-08df-fbd0-723e" name="Daemonic" hidden="false" targetId="a6d9-b8e9-21b2-96ff" type="rule"/>
                 <infoLink id="03bd-d44a-d79f-0066" name="Daemon Prince" hidden="false" targetId="b6a9-0fe9-848a-2d66" type="profile"/>
-                <infoLink id="3630-4c4c-d9f6-d20e" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
+                <infoLink id="1f10-fe31-26bd-c31c" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="104a-faac-cbfd-8ec4" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -3649,7 +3772,7 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <infoLink id="6628-4b40-6843-b80d" name="Daemon of Nurgle" hidden="false" targetId="0b9b-1baf-5bcd-1ec3" type="rule"/>
                 <infoLink id="a3aa-f33a-528a-bacf" name="Daemonic" hidden="false" targetId="a6d9-b8e9-21b2-96ff" type="rule"/>
                 <infoLink id="729f-3038-c8f6-686e" name="Daemon Prince" hidden="false" targetId="b6a9-0fe9-848a-2d66" type="profile"/>
-                <infoLink id="d435-c518-7fd2-5ab9" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
+                <infoLink id="82ca-2d5f-c0b2-2b89" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="96c0-09a4-0bd9-2715" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -3829,7 +3952,7 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
             <selectionEntry id="f825-1903-cfc8-f00a" name="Daemon Prince" hidden="false" collective="false" import="true" type="upgrade">
               <infoLinks>
                 <infoLink id="c05c-2648-852f-ffae" name="Daemon Prince" hidden="false" targetId="b6a9-0fe9-848a-2d66" type="profile"/>
-                <infoLink id="44e2-19de-0e28-9a7f" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
+                <infoLink id="44e2-19de-0e28-9a7f" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
                 <infoLink id="6782-b3a6-337a-4a4f" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="e5b5-f95a-23eb-0c3d" name="Daemonic" hidden="false" targetId="a6d9-b8e9-21b2-96ff" type="rule"/>
               </infoLinks>
@@ -4025,7 +4148,7 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <infoLink id="d9c8-5fa4-9780-80b7" name="Swiftstride" hidden="false" targetId="fdd9-fa75-5594-d363" type="rule"/>
                 <infoLink id="d76a-db4f-e7f5-a608" name="Daemonic" hidden="false" targetId="a6d9-b8e9-21b2-96ff" type="rule"/>
                 <infoLink id="504c-c5d6-5f7a-aec5" name="Daemon Prince" hidden="false" targetId="b6a9-0fe9-848a-2d66" type="profile"/>
-                <infoLink id="1974-e26d-003d-54f3" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
+                <infoLink id="a5e1-3369-7a6c-bb55" name="Terror" hidden="false" targetId="df59-4284-cca7-e4ca" type="rule"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="d1aa-14c2-23fb-2c66" name="Hand Weapon" hidden="false" collective="false" import="true" type="upgrade">
@@ -4282,6 +4405,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="d080-7ff4-9144-7f2f" name="Full Plate Armour" 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="c840-16dd-2a53-2277" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9f94-91cb-2370-3a8e" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="2b70-640c-8cb5-c29b" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -4691,6 +4826,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="8b78-6307-824f-ce27" name="Full Plate Armour" 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="b9e3-d0f3-41dd-f202" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0be2-3641-0862-3ac3" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="b59b-a6eb-bc28-88fb" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -5097,6 +5244,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="d219-6cf9-534b-f875" name="Full Plate Armour" 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="f362-b785-1c4a-dd67" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3dff-10ad-0505-53e1" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="0df4-51d1-894f-de44" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -5495,6 +5654,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="6dfd-847b-bbaf-5cfa" name="Full Plate Armour" 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="947e-d599-b117-c014" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bafb-eba4-a191-b5b5" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="7b8c-9e74-92b3-557b" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -6216,7 +6387,8 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -7390,6 +7562,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="9b13-4160-c3b9-1085" name="Full Plate Armour" 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="f2e5-d8de-b359-4379" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7be0-0823-d525-55e5" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="ab3a-cb01-1f3d-2f84" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -7458,6 +7642,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="2481-d5ec-fbe4-dab7" name="Full Plate Armour" 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="af93-9c61-9e01-62c1" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4094-f12f-63ee-4834" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="22b5-7c8d-69e0-4e59" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -7923,6 +8119,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="7ce6-6191-8920-d890" name="Full Plate Armour" 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="27f7-db1b-3284-5172" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6306-07bd-013e-1ef7" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="6dfd-03a2-8943-f405" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -7991,6 +8199,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="e625-e072-0d62-04ee" name="Full Plate Armour" 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="f5f6-a307-c8f4-1280" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ec33-9750-f3e0-7faf" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="2bd8-186b-99f7-7efd" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -8456,6 +8676,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="345f-dad8-74b5-7d5d" name="Full Plate Armour" 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="df9a-506d-ecb4-f881" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="78b4-aa75-1437-626d" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="ea95-ffef-dff3-6583" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -8524,6 +8756,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="c9bb-e60d-60cf-724d" name="Full Plate Armour" 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="fafa-b4a6-a01e-ea1c" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="578b-16dd-a5ad-5931" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="f82d-e22d-c630-19a4" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -8986,6 +9230,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="94c9-db18-7e23-b9f7" name="Full Plate Armour" 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="da25-b311-90e8-7a65" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b058-162f-bda2-8b5c" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="46f5-4efa-cbc3-756e" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -9053,6 +9309,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="c0c6-444e-ac35-72dd" name="Full Plate Armour" 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="6c38-9132-8163-ee8a" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8308-2db7-8705-c28f" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="3998-3653-7a08-12e6" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -9501,6 +9769,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="b4a0-f929-b184-5bf6" name="Full Plate Armour" 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="08b8-5023-f014-3207" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bbd4-6236-28da-1201" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="900c-a9cd-9e03-13fb" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -9569,6 +9849,18 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                                 <cost name="pts" typeId="points" value="0.0"/>
                               </costs>
                             </selectionEntry>
+                            <selectionEntry id="434f-bcf0-2b4b-b110" name="Full Plate Armour" 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="e868-ff43-5365-14d0" type="max"/>
+                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d981-c221-e6b0-0952" type="min"/>
+                              </constraints>
+                              <infoLinks>
+                                <infoLink id="5e3c-054c-936c-487e" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+                              </infoLinks>
+                              <costs>
+                                <cost name="pts" typeId="points" value="0.0"/>
+                              </costs>
+                            </selectionEntry>
                           </selectionEntries>
                           <costs>
                             <cost name="pts" typeId="points" value="0.0"/>
@@ -9921,6 +10213,50 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="2c9b-9806-e9c8-945c" name="Chaos Warshrine of Khorne" hidden="false" collective="false" import="true" type="model">
+          <infoLinks>
+            <infoLink id="b270-67a9-91ec-3ddd" name="Favour of Khorne" hidden="false" targetId="f1b3-9a1d-ee50-9b9f" type="profile"/>
+            <infoLink id="e882-6298-c7f4-363e" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
+            <infoLink id="0ff9-0851-7a46-8a6c" name="Giver of Glory" hidden="false" targetId="29d8-56a5-ea8a-80e4" type="rule"/>
+            <infoLink id="52f6-da1f-88b0-6837" name="Towering" hidden="false" targetId="cf7e-179f-186f-8108" type="rule"/>
+            <infoLink id="82f5-2f4d-cb45-2eb4" name="Ward Save (5+)" hidden="false" targetId="4b60-6477-75a8-f6dd" type="rule"/>
+            <infoLink id="4a52-acf4-0641-b282" name="Will of Chaos" hidden="false" targetId="d658-f5e9-8cbf-0cbb" type="rule"/>
+            <infoLink id="1d6a-afd5-9ed5-798c" name="Mark of Khorne" hidden="false" targetId="Mark of Khorne" type="rule"/>
+            <infoLink id="a0b1-c24f-89b7-0d24" name="Chaos Warshrine" hidden="false" targetId="cd60-020c-c3f2-a5fa" type="profile"/>
+          </infoLinks>
+          <selectionEntries>
+            <selectionEntry id="482b-4877-8849-a44c" name="Chaos Shrine Bearers" 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="935e-1c59-fe29-6004" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7b11-f061-8919-d82a" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="b569-8bff-a721-7357" name="Chaos Shrine Bearers" hidden="false" targetId="a631-99f6-e75a-5a8d" type="profile"/>
+                <infoLink id="9c0e-e4fe-dc3b-dab6" name="Random Attacks (D6+2)" hidden="false" targetId="33f1-4ddd-d26b-281a" type="rule"/>
+              </infoLinks>
+              <selectionEntries>
+                <selectionEntry id="fc8a-9c3c-a058-59ff" name="Hand Weapon" 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="1a98-0fdb-51d3-d5d2" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="18f5-0008-12d8-225c" type="min"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="20b7-00ec-14d0-1398" 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="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+          <costs>
+            <cost name="pts" typeId="points" value="95.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
         <selectionEntryGroup id="8d64-d9d6-8e27-bea4" name="Primary Weapon" hidden="false" collective="false" import="true">
@@ -12261,7 +12597,7 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <infoLink id="7067-0aad-3a57-5592" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="c835-a52f-5f8e-43b6" name="Marauder Horsemaster" hidden="false" collective="false" import="true" type="upgrade">
@@ -12526,7 +12862,7 @@ If Crom uses two hand weapons, he gains +3 Attacks rather than +1.</description>
                 <infoLink id="643a-7e94-09dd-f04d" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="8b1b-8f46-7464-aaac" name="Elite Marauder Horsemaster" hidden="false" collective="false" import="true" type="upgrade">
@@ -12817,6 +13153,29 @@ Forsaken of Nurgle have Fear.</description>
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="a6be-7cfe-bbac-360d" 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="fe15-3613-d39b-b2b1" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="1023-b947-6d0c-3b31" name="Light Armour" hidden="false" targetId="4129-1acd-3564-d3ea" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="2.5"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="dc9f-f2de-8175-e3ef" name="Javelins" 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="468e-5628-0ee2-8869" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9a2d-2e54-146f-891a" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="d4c7-0cb3-4a8f-f9b7" name="Javelins" hidden="false" targetId="3ecc-5d9c-7d29-ee2f" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -13585,6 +13944,18 @@ Forsaken of Nurgle have Fear.</description>
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="08d9-c0f7-aa3f-de25" name="Full Plate 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="c8a8-5570-d32e-e52f" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ba2c-f6f6-3a61-bc6f" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="88cc-5398-c663-02f3" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -13705,6 +14076,18 @@ Forsaken of Nurgle have Fear.</description>
                 <cost name="pts" typeId="points" value="0.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="4516-bfe0-dc24-83cd" name="Full Plate 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="40fe-bc96-bb62-d260" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bf29-f204-cccf-b1a2" type="min"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="0434-4252-3130-fb29" name="Full Plate Armour" hidden="false" targetId="9594-9ece-7acf-49be" type="profile"/>
+              </infoLinks>
+              <costs>
+                <cost name="pts" typeId="points" value="0.0"/>
+              </costs>
+            </selectionEntry>
           </selectionEntries>
           <costs>
             <cost name="pts" typeId="points" value="0.0"/>
@@ -14334,7 +14717,7 @@ Forsaken of Nurgle have Fear.</description>
                 <infoLink id="42c5-4a8a-157a-260b" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="a25d-f515-3598-a63f" name="Elite Marauder Horsemaster" hidden="false" collective="false" import="true" type="upgrade">
@@ -14878,7 +15261,7 @@ Forsaken of Nurgle have Fear.</description>
                 <infoLink id="e7e9-8ad0-f5ba-3893" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -16734,7 +17117,8 @@ The unit&apos;s models gain Poisoned Attacks.</description>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af"/>
                   </characteristics>
                 </profile>
               </profiles>
@@ -17034,17 +17418,6 @@ The unit&apos;s models gain Poisoned Attacks.</description>
               </costs>
             </selectionEntry>
             <selectionEntry id="5616-6a24-a1b1-5ce4" name="Chaos Warshrine of Khorne" hidden="false" collective="false" import="true" type="model">
-              <profiles>
-                <profile id="28f0-668b-205f-26b2" name="Favour of Khorne" publicationId="1a01-044f-047b-618f" page="193" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
-                  <characteristics>
-                    <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">Bound Spell</characteristic>
-                    <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
-                    <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">3+</characteristic>
-                    <characteristic name="Range" typeId="2954-76ea-decb-30ff">18&quot;</characteristic>
-                    <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Until the start of your next magic phase, the target unit can re-roll all failed To Hit rolls.</characteristic>
-                  </characteristics>
-                </profile>
-              </profiles>
               <infoLinks>
                 <infoLink id="d95a-1344-93d1-8cb9" name="Chaos Warshrine" hidden="false" targetId="cd60-020c-c3f2-a5fa" type="profile"/>
                 <infoLink id="a495-0f4e-caef-b6b3" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
@@ -17053,6 +17426,7 @@ The unit&apos;s models gain Poisoned Attacks.</description>
                 <infoLink id="b221-0e3d-9624-8a70" name="Ward Save (5+)" hidden="false" targetId="4b60-6477-75a8-f6dd" type="rule"/>
                 <infoLink id="2984-03bd-2bb3-8013" name="Will of Chaos" hidden="false" targetId="d658-f5e9-8cbf-0cbb" type="rule"/>
                 <infoLink id="894a-715a-6dc9-6284" name="Mark of Khorne" hidden="false" targetId="Mark of Khorne" type="rule"/>
+                <infoLink id="1807-e0fb-d3ce-ddb8" name="Favour of Khorne" hidden="false" targetId="f1b3-9a1d-ee50-9b9f" type="profile"/>
               </infoLinks>
               <selectionEntries>
                 <selectionEntry id="6eb7-7ca2-6f53-eef5" name="Chaos Shrinemaster" hidden="false" collective="false" import="true" type="model">
@@ -19116,7 +19490,7 @@ Beasts, Monstrous Infantry, Monstrous Cavalry, Chariots, War Machines, and Shrin
           <profiles>
             <profile id="a869-364b-b31c-a712" name="Hellshriek" publicationId="1a01-044f-047b-618f" page="245" hidden="false" typeId="49dc-2fd8-b942-dbc2" typeName="Chaos Mutations and Powers">
               <characteristics>
-                <characteristic name="Special Rules" typeId="7ab4-c2c7-7e2c-9cb0">One use only. The character can use this ability at the start of any Magic phase, immediately after rolling for the Winds of Magic. All enemy Wizards within 18&quot; immediately suffer a Miscast. Roll a D3 and add it to the result.</characteristic>
+                <characteristic name="Special Rules" typeId="7ab4-c2c7-7e2c-9cb0">One use only. The character can use this ability at the start of any Magic phase, immediately after rolling for the Winds of Magic. All enemy Wizards within 18&quot; must immediately roll 2D6 on the Miscast table.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -19187,7 +19561,7 @@ Note that the Chaos Champion itself must cause the last unsaved Wound on a model
       <description>Units with this rule always re-roll failed Panic tests.</description>
     </rule>
     <rule id="a6d9-b8e9-21b2-96ff" name="Daemonic" publicationId="1a01-044f-047b-618f" page="162" hidden="false">
-      <description>Models with this rule have Fear and Magical Attacks. In addition, models that are not mounts also have Ward save (5+) and Unstable.</description>
+      <description>Models with this rule have Fear and Magical Attacks. In addition, models that are not mounts also have Immunity (Poisoned Attacks), Ward save (5+) and Unstable.</description>
     </rule>
     <rule id="Mark of Khorne" name="Mark of Khorne" publicationId="1a01-044f-047b-618f" page="163" hidden="false">
       <description>Your General and Battle Standard Bearer must have the same Mark (if one is chosen). Models with different Marks treat each other as Suspicious Allies. However, models with the Mark of Khorne and Slaanesh, or Tzeentch and Nurgle, treat each other as Desperate Allies, respectively.
@@ -19355,7 +19729,7 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 2+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="0b1e-3b66-a4c5-f3cf" name="Gorebeast" publicationId="1a01-044f-047b-618f" page="178" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -19489,7 +19863,8 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
       </characteristics>
     </profile>
     <profile id="Daemon Prince 3" name="Daemon Prince" publicationId="1a01-044f-047b-618f" page="171" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -19497,7 +19872,8 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
       </characteristics>
     </profile>
     <profile id="Daemon Prince 2" name="Daemon Prince" publicationId="1a01-044f-047b-618f" page="171" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -19505,7 +19881,8 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
       </characteristics>
     </profile>
     <profile id="Daemon Prince 1" name="Daemon Prince" publicationId="1a01-044f-047b-618f" page="171" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -19513,7 +19890,8 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
       </characteristics>
     </profile>
     <profile id="1e26-16e3-01da-e228" name="Chaos Lord" publicationId="1a01-044f-047b-618f" page="165" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -19549,7 +19927,8 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
       </characteristics>
     </profile>
     <profile id="Chaos Sorcerer Lord 4" name="Chaos Sorcerer Lord" publicationId="1a01-044f-047b-618f" page="168" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -19557,7 +19936,8 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
       </characteristics>
     </profile>
     <profile id="50d0-ca71-152f-8cba" name="Chaos Sorcerer" publicationId="1a01-044f-047b-618f" page="168" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -19579,7 +19959,8 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
       </characteristics>
     </profile>
     <profile id="Chaos Sorcerer 2" name="Chaos Sorcerer" publicationId="1a01-044f-047b-618f" page="168" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
@@ -19587,7 +19968,8 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
         <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
         <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-        <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+        <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+        <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
       </characteristics>
     </profile>
     <profile id="c8f6-2a85-a4c3-042e" name="Exalted Hero" publicationId="1a01-044f-047b-618f" page="165" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -19615,7 +19997,7 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="I" typeId="7cca-e51f-edc2-7322"/>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0"/>
         <characteristic name="LD" typeId="a199-f10b-a038-5730"/>
-        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 5+)</characteristic>
+        <characteristic name="Type" typeId="13f9-a26b-05af-3459">Chariot (Armour save 6+)</characteristic>
       </characteristics>
     </profile>
     <profile id="1847-c0e4-4eac-56a7" name="Marauder Charioteer" publicationId="1a01-044f-047b-618f" page="174" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
@@ -19779,6 +20161,15 @@ If you do not have a spare Daemon Prince model, or if it cannot be placed on the
         <characteristic name="Type" typeId="13f9-a26b-05af-3459">Infantry</characteristic>
       </characteristics>
     </profile>
+    <profile id="f1b3-9a1d-ee50-9b9f" name="Favour of Khorne" publicationId="1a01-044f-047b-618f" page="193" hidden="false" typeId="cb92-d882-5ba8-11ab" typeName="Spell">
+      <characteristics>
+        <characteristic name="Spell Level" typeId="576b-eaa1-0bd1-3f7a">Bound Spell</characteristic>
+        <characteristic name="Type" typeId="21e9-4aa2-f538-c93b">Augment</characteristic>
+        <characteristic name="Casting Value" typeId="d6bf-647e-ba69-e8a0">3+</characteristic>
+        <characteristic name="Range" typeId="2954-76ea-decb-30ff">18&quot;</characteristic>
+        <characteristic name="Details" typeId="f5f2-ac1b-25cd-89c6">Until the start of your next magic phase, the target unit can re-roll all failed To Hit rolls.</characteristic>
+      </characteristics>
+    </profile>
   </sharedProfiles>
   <catalogueLinks>
     <catalogueLink id="8108-8c24-147f-5698" name="Magic" targetId="a579-d41f-e1ad-746f" type="catalogue" importRootEntries="true"/>
diff --git a/Wood_Elves.cat b/Wood_Elves.cat
index c34067e..bfc21c9 100644
--- a/Wood_Elves.cat
+++ b/Wood_Elves.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ed67-4ca1-2eb7-8b8a" name="Wood Elves" revision="8" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="ed67-4ca1-2eb7-8b8a" name="Wood Elves" 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|https://discordapp.com/invite/UrrPB3T" library="false" gameSystemId="9e23-79cb-afed-cf4c" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profileTypes>
     <profileType id="c3a4-9eb1-eef6-d5ec" name="Enchanted Arrows">
       <characteristicTypes>
@@ -371,7 +371,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -463,7 +464,8 @@
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -831,7 +833,7 @@
                 <infoLink id="1de8-cc59-b3c9-e7c4" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="40.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="9d7b-9d95-9974-9cb1" name="Forest Dragon" hidden="false" collective="false" import="true" type="model">
@@ -945,6 +947,34 @@
                 <infoLink id="e0fe-8bb3-5566-a627" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
                 <infoLink id="43b6-d995-c6ca-0b29" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="e14e-f6cf-cb80-5dee" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="84c2-522b-2bc2-57b8" name="Shredding Talons" 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="6efa-b91f-7d0b-8e7b" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="21e4-4554-b6b8-ca81" name="Shredding Talons" hidden="false" targetId="c985-c6aa-5e73-f7b1" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="0b19-39f1-dd12-5bfd" name="Swiftsense" 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="f4ec-0c8d-0781-a8b2" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="8dfb-1fe0-6b3c-51b3" name="Swiftsense" hidden="false" targetId="3805-f2d7-2c86-77e3" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="65.0"/>
               </costs>
@@ -1193,7 +1223,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">4</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">4</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-6</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">6</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1229,7 +1260,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">3</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">3</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-5</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">2</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">5</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">2</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1285,7 +1317,7 @@
                 <infoLink id="8a2f-5b91-6f1a-caff" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="40.0"/>
+                <cost name="pts" typeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="869c-60ec-b730-6685" name="Great Eagle" hidden="false" collective="false" import="true" type="model">
@@ -1299,6 +1331,34 @@
                 <infoLink id="c5ee-ffe9-2cb9-cd92" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
                 <infoLink id="c0e7-4dae-4fa2-5cb1" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="6fe2-a618-73c0-0747" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="b455-cfb3-1642-b42a" name="Shredding Talons" 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="6008-2b8a-f5b1-d155" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="89bf-235e-fb8b-0640" name="Shredding Talons" hidden="false" targetId="c985-c6aa-5e73-f7b1" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="c5a3-bde8-1e71-aa80" name="Swiftsense" 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="b1e3-1020-ee68-8854" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="5e70-5ba4-0fce-07b1" name="Swiftsense" hidden="false" targetId="3805-f2d7-2c86-77e3" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="65.0"/>
               </costs>
@@ -1316,7 +1376,7 @@
                 <infoLink id="da44-ddb2-0d94-5eff" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="55.0"/>
+                <cost name="pts" typeId="points" value="50.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1334,13 +1394,13 @@
         <profile id="cd04-bfb7-4594-3bcc" name="Treeman Ancient" publicationId="e967-620f-06be-096a" page="134" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
           <characteristics>
             <characteristic name="M" typeId="09ad-18df-607b-1215">5</characteristic>
-            <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
-            <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">4</characteristic>
+            <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</characteristic>
+            <characteristic name="BS" typeId="7b67-9dfa-eeac-d007">5</characteristic>
             <characteristic name="S" typeId="edd2-7979-54a4-6b35">5</characteristic>
             <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">6</characteristic>
             <characteristic name="W" typeId="27ee-0675-122f-a1b1">6</characteristic>
             <characteristic name="I" typeId="7cca-e51f-edc2-7322">2</characteristic>
-            <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">3</characteristic>
+            <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">4</characteristic>
             <characteristic name="LD" typeId="a199-f10b-a038-5730">10</characteristic>
             <characteristic name="Type" typeId="13f9-a26b-05af-3459">Monster (Character)</characteristic>
           </characteristics>
@@ -1400,7 +1460,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1433,7 +1494,8 @@
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -1463,7 +1525,7 @@
         <entryLink id="9ecf-1619-6a98-6174" name="General" hidden="false" collective="false" import="true" targetId="d322-3c7a-6d1e-7dc2" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="245.0"/>
+        <cost name="pts" typeId="points" value="270.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f5ba-3655-faf6-356d" name="Drycha" hidden="false" collective="false" import="true" type="model">
@@ -1521,7 +1583,8 @@ At the start of the Remaining Moves sub-phase of your first turn, roll a D6 for
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -1765,6 +1828,34 @@ At the start of the Remaining Moves sub-phase of your first turn, roll a D6 for
                 <infoLink id="c81a-3549-fd34-3638" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
                 <infoLink id="6a62-bca3-413c-0afa" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="ad78-5a09-9db6-b6ca" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="3b40-3d86-dea8-9e13" name="Shredding Talons" 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="807c-0132-3321-bba3" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="a41c-8e83-d69b-4eb7" name="Shredding Talons" hidden="false" targetId="c985-c6aa-5e73-f7b1" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="0d84-96c7-91c6-9687" name="Swiftsense" 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="0fba-5e8f-2a6f-41a5" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="9eb2-fa65-79e3-daf7" name="Swiftsense" hidden="false" targetId="3805-f2d7-2c86-77e3" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
                 <cost name="pts" typeId="points" value="100.0"/>
               </costs>
@@ -1824,7 +1915,8 @@ At the start of the Remaining Moves sub-phase of your first turn, roll a D6 for
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -2074,7 +2166,7 @@ At the start of the Remaining Moves sub-phase of your first turn, roll a D6 for
       </profiles>
       <rules>
         <rule id="43c7-b9f5-2f30-cea2" name="Falcons" publicationId="e967-620f-06be-096a" page="160" hidden="false">
-          <description>Skaw may use his Falcons in addition to another missile weapon during the start of the Shooting phase. The Falcons can be directed against any enemy unit within line of sight, regardless of range. The enemy unit must take a WS test for each War Hawk targeting them; if failed, the unit takes a S 3 Hit.
+          <description>Skaw may use his 3 Falcons in addition to another missile weapon during the start of the Shooting phase. The Falcons can be directed against any enemy unit within line of sight, regardless of range. The enemy unit must take a WS test for each War Hawk targeting them; if failed, the unit takes a S 3 Hit.
 
 In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4, S 3 and I 4. These attacks no not benefit from any rules or items that Skaw might have.</description>
         </rule>
@@ -2398,7 +2490,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <infoLink id="9cb3-afb4-01a4-29b0" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="40.0"/>
+                <cost name="pts" typeId="points" value="20.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="5598-adfd-a48f-3485" name="Meadow Chariot" hidden="false" collective="false" import="true" type="model">
@@ -2493,8 +2585,36 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <infoLink id="a073-fd13-ae0d-7e08" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
                 <infoLink id="48b9-d5d1-bbd4-e8c8" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="b24a-b514-31d6-3383" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="ae4e-5c65-8eec-789c" name="Shredding Talons" 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="ded8-0195-9e24-a649" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="9e94-10ac-7950-6b06" name="Shredding Talons" hidden="false" targetId="c985-c6aa-5e73-f7b1" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="3b55-1c20-496a-9f75" name="Swiftsense" 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="e083-aad2-e39c-5cf0" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="c173-2a97-9077-e960" name="Swiftsense" hidden="false" targetId="3805-f2d7-2c86-77e3" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="75.0"/>
+                <cost name="pts" typeId="points" value="65.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="f7d3-07a5-dd76-81f9" name="Great Stag" hidden="false" collective="false" import="true" type="model">
@@ -2786,7 +2906,8 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-4</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2822,7 +2943,8 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                     <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -2878,7 +3000,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <infoLink id="cd8a-7ea3-23ea-3f2a" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="40.0"/>
+                <cost name="pts" typeId="points" value="20.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="eeeb-5e3a-b845-7973" name="Great Eagle" hidden="false" collective="false" import="true" type="model">
@@ -2892,8 +3014,36 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <infoLink id="8c4e-7a52-dfd9-ad9e" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
                 <infoLink id="8c75-c27e-9b3b-6827" name="Impact Hits (1)" hidden="false" targetId="bb3b-3ca8-fcbc-a78b" type="rule"/>
               </infoLinks>
+              <selectionEntryGroups>
+                <selectionEntryGroup id="ebf9-7fb8-9ea1-05cd" name="Upgrades" hidden="false" collective="false" import="true">
+                  <selectionEntries>
+                    <selectionEntry id="b1d4-dadf-466b-958d" name="Shredding Talons" 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="848b-b9d6-8869-a65e" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="0393-9468-29b2-4f40" name="Shredding Talons" hidden="false" targetId="c985-c6aa-5e73-f7b1" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                    <selectionEntry id="3ddc-51cd-c382-3bae" name="Swiftsense" 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="3f2b-5cdf-45d0-c48f" type="max"/>
+                      </constraints>
+                      <infoLinks>
+                        <infoLink id="bc3c-e99b-fb1f-4e6c" name="Swiftsense" hidden="false" targetId="3805-f2d7-2c86-77e3" type="rule"/>
+                      </infoLinks>
+                      <costs>
+                        <cost name="pts" typeId="points" value="5.0"/>
+                      </costs>
+                    </selectionEntry>
+                  </selectionEntries>
+                </selectionEntryGroup>
+              </selectionEntryGroups>
               <costs>
-                <cost name="pts" typeId="points" value="75.0"/>
+                <cost name="pts" typeId="points" value="65.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="c23d-39b8-8528-ef4e" name="Unicorn" hidden="false" collective="false" import="true" type="model">
@@ -2909,7 +3059,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <infoLink id="0e5f-9812-4ffc-68e8" name="Fear" hidden="false" targetId="7bd0-8602-4375-a731" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="55.0"/>
+                <cost name="pts" typeId="points" value="50.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2990,7 +3140,8 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -3197,7 +3348,8 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">1</characteristic>
                 <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">1</characteristic>
                 <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e">1-3</characteristic>
-                <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">3</characteristic>
+                <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -4040,7 +4192,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <infoLink id="4b1a-9ffd-cb2b-652c" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="6b9e-fb82-2224-9b05" name="Glade Knight" hidden="false" collective="false" import="true" type="upgrade">
@@ -4471,7 +4623,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <infoLink id="90f8-d5fd-70d4-56f7" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="e577-b886-5c06-50c3" name="Wild Hunter" hidden="false" collective="false" import="true" type="upgrade">
@@ -4913,7 +5065,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
             <profile id="00c4-3212-99ba-194e" name="Tree Revenant" publicationId="e967-620f-06be-096a" page="129" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
               <characteristics>
                 <characteristic name="M" typeId="09ad-18df-607b-1215">5</characteristic>
-                <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</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>
@@ -4967,7 +5119,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
             </selectionEntryGroup>
           </selectionEntryGroups>
           <costs>
-            <cost name="pts" typeId="points" value="14.0"/>
+            <cost name="pts" typeId="points" value="13.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4982,7 +5134,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <profile id="7e71-f054-05fc-7dc9" name="Scion" publicationId="e967-620f-06be-096a" page="129" hidden="false" typeId="d9ed-a507-0102-d498" typeName="Model">
                   <characteristics>
                     <characteristic name="M" typeId="09ad-18df-607b-1215">5</characteristic>
-                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">4</characteristic>
+                    <characteristic name="WS" typeId="f049-8a65-9c04-1559">5</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>
@@ -5057,7 +5209,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
           </profiles>
           <rules>
             <rule id="3031-378f-ae9b-507a" name="Unbridled Malice" publicationId="e967-620f-06be-096a" page="130" hidden="false">
-              <description>Enemy units in base contact with models with this rule must re-roll successful LD tests. This has no effect on units that have Immunity (Psychology).</description>
+              <description>Spite Revenants&apos; Hatred applies in all rounds of combat, not just the first. In addition, enemy units in base contact with them must re-roll successful LD tests. This has no effect on units that have Immunity (Psychology).</description>
             </rule>
           </rules>
           <infoLinks>
@@ -5066,7 +5218,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
             <infoLink id="cc35-373a-7027-5f3a" name="Skirmishers" hidden="false" targetId="9a30-1c5c-12f4-5798" type="rule"/>
           </infoLinks>
           <costs>
-            <cost name="pts" typeId="points" value="13.0"/>
+            <cost name="pts" typeId="points" value="12.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -5392,9 +5544,10 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <profile id="6fdc-90fe-18c9-7555" name="Sister of the Thorn" publicationId="e967-620f-06be-096a" page="122" hidden="false" typeId="0ce6-a5f9-6184-218d" typeName="Wizard">
                   <characteristics>
                     <characteristic name="Wizard Level" typeId="7f8d-5707-7251-c1a5">2</characteristic>
-                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e"/>
+                    <characteristic name="Known Spells" typeId="b859-9e7c-9452-f90e">2</characteristic>
                     <characteristic name="Spell Level" typeId="c5a7-d8e1-9c88-2f0e"/>
-                    <characteristic name="Bonus to Casting/Dispel Value" typeId="d5d5-4c2e-491e-474a">1</characteristic>
+                    <characteristic name="Max. Power Dice Per Spell" typeId="d5d5-4c2e-491e-474a">4</characteristic>
+                    <characteristic name="Bonus to Casting/Dispel Value" typeId="7261-e23f-ab6d-b4af">1</characteristic>
                   </characteristics>
                 </profile>
               </profiles>
@@ -5567,7 +5720,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                       <characteristics>
                         <characteristic name="Range" typeId="59f2-3142-82d5-4f43">36&quot;</characteristic>
                         <characteristic name="Strength" typeId="b80e-7dac-0dea-9add">5</characteristic>
-                        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Volley Fire.</characteristic>
+                        <characteristic name="Special Rules" typeId="de63-d6da-efa8-00ac">Longbow. Magical Attacks.</characteristic>
                       </characteristics>
                     </profile>
                   </profiles>
@@ -5635,6 +5788,34 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
             <infoLink id="6f9d-0c32-a27e-46fc" name="Great Eagle" hidden="false" targetId="2072-1a44-7062-fd03" type="profile"/>
             <infoLink id="6fc9-cc4d-a984-d32f" name="Fly" hidden="false" targetId="953a-d5a4-ee81-4093" type="rule"/>
           </infoLinks>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="ed56-4579-4408-190a" name="Upgrades" hidden="false" collective="false" import="true">
+              <selectionEntries>
+                <selectionEntry id="2076-bcb4-9baa-d07b" name="Shredding Talons" 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="9fc5-354c-d920-d940" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="5a77-6cbb-54ff-dc0a" name="Shredding Talons" hidden="false" targetId="c985-c6aa-5e73-f7b1" type="rule"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="5.0"/>
+                  </costs>
+                </selectionEntry>
+                <selectionEntry id="3db1-84e8-6d92-3c13" name="Swiftsense" 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="d96e-fbd0-1344-6451" type="max"/>
+                  </constraints>
+                  <infoLinks>
+                    <infoLink id="f33b-2333-6e42-5a17" name="Swiftsense" hidden="false" targetId="3805-f2d7-2c86-77e3" type="rule"/>
+                  </infoLinks>
+                  <costs>
+                    <cost name="pts" typeId="points" value="5.0"/>
+                  </costs>
+                </selectionEntry>
+              </selectionEntries>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
           <costs>
             <cost name="pts" typeId="points" value="50.0"/>
           </costs>
@@ -5887,7 +6068,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
                 <infoLink id="2489-c395-d1d3-602a" name="Musician" hidden="false" targetId="54c3-1d1b-3ffe-59a5" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="pts" typeId="points" value="10.0"/>
+                <cost name="pts" typeId="points" value="5.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="5a8d-d92d-1ae0-5476" name="Wild Hunter" hidden="false" collective="false" import="true" type="upgrade">
@@ -6185,7 +6366,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
           <profiles>
             <profile id="08a6-84a0-41d7-8081" name="Daith&apos;s Reaper" publicationId="e967-620f-06be-096a" page="166" hidden="false" typeId="c119-42f4-2cbe-71a5" typeName="Magic Weapon">
               <characteristics>
-                <characteristic name="Range" typeId="4285-3917-6bf9-348b">Melee</characteristic>
+                <characteristic name="Range" typeId="4285-3917-6bf9-348b">Combat</characteristic>
                 <characteristic name="Strength" typeId="a1a2-667b-2ec7-4ba7"/>
                 <characteristic name="Special Rules" typeId="ce2d-df6c-9271-a2f8">All failed To Hit and To Wound rolls made with Daith’s Reaper must be re-rolled, as must all successful armour saves taken against Wounds caused by this weapon.</characteristic>
               </characteristics>
@@ -6221,9 +6402,9 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
           <profiles>
             <profile id="e9bd-7f1d-b217-b757" name="The Spirit Sword" publicationId="e967-620f-06be-096a" page="166" hidden="false" typeId="c119-42f4-2cbe-71a5" typeName="Magic Weapon">
               <characteristics>
-                <characteristic name="Range" typeId="4285-3917-6bf9-348b">Melee</characteristic>
+                <characteristic name="Range" typeId="4285-3917-6bf9-348b">Combat</characteristic>
                 <characteristic name="Strength" typeId="a1a2-667b-2ec7-4ba7"/>
-                <characteristic name="Special Rules" typeId="ce2d-df6c-9271-a2f8">Armour saves cannot be taken against Wounds caused by the Spirit Sword. Furthermore, immediately when an enemy Monster or Character suffers one or more unsaved Wounds from the Spirit Sword, both they and the wielder must roll 2D6 and add their respective LD values. If the wounded model’s total is higher, or the totals are the same, nothing else happens. If the wounded model’s total is lower, it immediately suffers a Wound which Ignores Armour Saves for each point by which its total was exceeded. This has no effect on Animated Constructs.</characteristic>
+                <characteristic name="Special Rules" typeId="ce2d-df6c-9271-a2f8">Armour saves cannot be taken against Wounds caused by the Spirit Sword. Furthermore, immediately when an enemy single model unit (that is not an Animated Construct) or Character suffers one or more unsaved Wounds from the Spirit Sword, both they and the wielder must roll 2D6 and add their respective LD values. If the wounded model’s total is higher, or the totals are the same, nothing else happens. If the wounded model’s total is lower, it immediately suffers a Wound which Ignores Armour Saves for each point by which its total was exceeded.</characteristic>
               </characteristics>
             </profile>
           </profiles>
@@ -6335,7 +6516,7 @@ In close combat, the birds give Skaw an additional 3 A that are resolved at WS 4
           <profiles>
             <profile id="5995-7487-00be-3a5c" name="Hail of Doom Arrow" publicationId="e967-620f-06be-096a" page="167" hidden="false" typeId="ff67-d27f-2eef-bb35" typeName="Enchanted Item">
               <characteristics>
-                <characteristic name="Special Rules" typeId="9d2e-d14d-dd58-a829">One use only. Glade Lord or Glade Captain with Asrai longbow only. The Hail of Doom arrow can be used instead of making a Shooting attack with the bearer’s Asrai longbow. Declare that the Hail of Doom Arrow is being used before any dice are rolled.</characteristic>
+                <characteristic name="Special Rules" typeId="9d2e-d14d-dd58-a829">One use only. Model with Asrai longbow only. The Hail of Doom arrow can be used instead of making a Shooting attack with the bearer’s Asrai longbow, though it cannot be used with Sniper. Declare that the Hail of Doom Arrow is being used before any dice are rolled.</characteristic>
               </characteristics>
             </profile>
             <profile id="b1e4-9d6a-4fde-4835" name="Hail of Doom Arrow" publicationId="e967-620f-06be-096a" page="167" hidden="false" typeId="c119-42f4-2cbe-71a5" typeName="Magic Weapon">
@@ -6454,11 +6635,17 @@ To resolve a Tree Whack, nominate an enemy model in base contact. That model mus
       <description>A Forest Dragon has a S 2 Breath Weapon. Armour saves taken against Wounds caused by Soporific Breath suffer a -3 penalty. All models in a unit that suffers one or more hits from Soporific Breath gain Stupidity for the remainder of the game.</description>
     </rule>
     <rule id="8019-e15c-4a5c-c6d8" name="Conjoined Destiny" publicationId="e967-620f-06be-096a" page="155" hidden="false">
-      <description>If Naestra and Arahan have been reduced to less than 4 Wounds at the end any turn, they will both be restored to 4 Wounds. In addition, if either Naestra or Arahan issues or accepts a challenge, the other can attack (and be attacked) as part of the challenge.</description>
+      <description>If Naestra and Arahan have been reduced to less than 4 Wounds at the end any turn, they will be restored to 4 Wounds.</description>
     </rule>
     <rule id="1e00-a146-8714-588f" name="Sisters of Twilight" publicationId="e967-620f-06be-096a" page="155" hidden="false">
       <description>Naestra’s close combat attacks receive a +1 bonus To Wound against models from the Forces of Destruction. Arahan’s close combat attacks receive a +1 bonus To Wound against models from the Forces of Order.</description>
     </rule>
+    <rule id="3805-f2d7-2c86-77e3" name="Swiftsense" publicationId="e967-620f-06be-096a" page="136" hidden="false">
+      <description>The model gains +1 I.</description>
+    </rule>
+    <rule id="c985-c6aa-5e73-f7b1" name="Shredding Talons" publicationId="e967-620f-06be-096a" page="136" hidden="false">
+      <description>The model gains Armour Piercing (1).</description>
+    </rule>
   </sharedRules>
   <sharedProfiles>
     <profile id="7fbc-b04b-596a-89ba" name="Asrai Longbow" publicationId="e967-620f-06be-096a" page="106" hidden="false" typeId="6f70-cea1-702c-43bc" typeName="Weapon">
@@ -6577,7 +6764,7 @@ To resolve a Tree Whack, nominate an enemy model in base contact. That model mus
         <characteristic name="BS" typeId="7b67-9dfa-eeac-d007"/>
         <characteristic name="S" typeId="edd2-7979-54a4-6b35">4</characteristic>
         <characteristic name="T" typeId="df90-5cbd-8cf9-95b2">4</characteristic>
-        <characteristic name="W" typeId="27ee-0675-122f-a1b1">1</characteristic>
+        <characteristic name="W" typeId="27ee-0675-122f-a1b1">2</characteristic>
         <characteristic name="I" typeId="7cca-e51f-edc2-7322">5</characteristic>
         <characteristic name="A" typeId="bfa2-d38d-7c93-d3f0">2</characteristic>
         <characteristic name="LD" typeId="a199-f10b-a038-5730">8</characteristic>