diff --git a/Renegades & Heretics - FW.cat b/Renegades & Heretics - FW.cat
index bbc146ff..e47460fe 100644
--- a/Renegades & Heretics - FW.cat	
+++ b/Renegades & Heretics - FW.cat	
@@ -14930,23 +14930,50 @@
       <entries>
         <entry id="e1c152cb-f547-8d5d-fd1b-a04447cc0030" name="Rogue Psyker" points="35.0" categoryId="(No Category)" type="model" minSelections="1" maxSelections="5" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="">
           <entries>
-            <entry id="fa33ff2f-99d3-ec49-d484-5ce9ea79bf6f" name="Powers of the Witch" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false" page="0">
-              <entries/>
+            <entry id="fa33ff2f-99d3-ec49-d484-5ce9ea79bf6f" name="Powers of the Witch" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false" page="0">
+              <entries>
+                <entry id="cb639579-d91a-50b9-54e8-30b9be3c0988" name="1-2: Creeping Terror" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false">
+                  <entries/>
+                  <entryGroups/>
+                  <modifiers/>
+                  <rules/>
+                  <profiles/>
+                  <links>
+                    <link id="754b2dbf-b2c6-f3d0-f89b-691852c9996b" targetId="b513ac41-1f57-fee1-6f8f-e8be75290a02" linkType="profile">
+                      <modifiers/>
+                    </link>
+                  </links>
+                </entry>
+                <entry id="d4c151de-22d5-26ee-fd0f-e6b9ef3f8a69" name="3-4: Warp Flux" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false">
+                  <entries/>
+                  <entryGroups/>
+                  <modifiers/>
+                  <rules/>
+                  <profiles/>
+                  <links>
+                    <link id="a86e3d7f-2da7-c4bf-d0d9-a26765c62bd9" targetId="e771065e-e3d1-f6a0-8581-1be19f8e547f" linkType="profile">
+                      <modifiers/>
+                    </link>
+                  </links>
+                </entry>
+                <entry id="d34916c4-50a5-f7bb-1394-3d1e58d7284e" name="5-6: Unnatural Vigour" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false">
+                  <entries/>
+                  <entryGroups/>
+                  <modifiers/>
+                  <rules/>
+                  <profiles/>
+                  <links>
+                    <link id="f511f3b4-873a-1b03-73f5-2131090678fc" targetId="58a663f0-4a0f-9787-abb4-0685e80f0e1d" linkType="profile">
+                      <modifiers/>
+                    </link>
+                  </links>
+                </entry>
+              </entries>
               <entryGroups/>
               <modifiers/>
               <rules/>
               <profiles/>
-              <links>
-                <link id="639a5081-6871-f03c-542a-ccfd5565473c" targetId="b513ac41-1f57-fee1-6f8f-e8be75290a02" linkType="profile">
-                  <modifiers/>
-                </link>
-                <link id="08154991-bb5c-04bf-2029-30923fe91103" targetId="58a663f0-4a0f-9787-abb4-0685e80f0e1d" linkType="profile">
-                  <modifiers/>
-                </link>
-                <link id="97f9b7f1-fd99-e9da-7294-6833113d5379" targetId="e771065e-e3d1-f6a0-8581-1be19f8e547f" linkType="profile">
-                  <modifiers/>
-                </link>
-              </links>
+              <links/>
             </entry>
             <entry id="e43c4744-ee17-230e-5450-a99c3dbb2cdb" name="Possessed" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false" page="0">
               <entries/>
@@ -15006,41 +15033,68 @@
       <entries>
         <entry id="f9ab96de-09af-3bc9-e238-b7f2e9926f65" name="Rogue Psyker" points="35.0" categoryId="(No Category)" type="model" minSelections="1" maxSelections="5" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false" book="">
           <entries>
-            <entry id="04dbe980-4e04-aa51-37cd-da38c981b065" name="Powers of the Witch" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false" page="0">
+            <entry id="383d880a-e110-921d-bbb9-18517468afc8" name="Possessed" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false" page="0">
               <entries/>
               <entryGroups/>
               <modifiers/>
               <rules/>
               <profiles/>
               <links>
-                <link id="c751ccef-9a57-f2f2-f7fd-de42b5a4a682" targetId="b513ac41-1f57-fee1-6f8f-e8be75290a02" linkType="profile">
+                <link id="3a5bdf72-42c2-8ecf-8506-0b43f421fc15" targetId="b48e3b74-3e33-827a-c367-72996281ad32" linkType="profile">
                   <modifiers/>
                 </link>
-                <link id="5a84c8e8-27e7-f40c-2a8a-c1efaeef0463" targetId="58a663f0-4a0f-9787-abb4-0685e80f0e1d" linkType="profile">
+                <link id="b65dc4f3-b71a-8dc2-9a7b-39e63fccae8c" targetId="024c79a3-48d4-03cc-8d50-7979e3f2f58b" linkType="rule">
                   <modifiers/>
                 </link>
-                <link id="20461444-c399-f8a5-9975-32c9ebcb580c" targetId="e771065e-e3d1-f6a0-8581-1be19f8e547f" linkType="profile">
+                <link id="f83e2c4c-6a8c-af4e-6c5d-3951111b15ca" targetId="b20afe1b-5f12-4250-ef66-66f047ebeb36" linkType="rule">
                   <modifiers/>
                 </link>
               </links>
             </entry>
-            <entry id="383d880a-e110-921d-bbb9-18517468afc8" name="Possessed" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false" page="0">
-              <entries/>
+            <entry id="cdf62cb5-e15b-8b3a-f4b9-daeb1bdd50b6" name="Powers of the Witch" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false" page="0">
+              <entries>
+                <entry id="92f89cd6-3a94-89a3-6309-beef02153811" name="1-2: Creeping Terror" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false">
+                  <entries/>
+                  <entryGroups/>
+                  <modifiers/>
+                  <rules/>
+                  <profiles/>
+                  <links>
+                    <link id="6431646c-b5cb-2065-bfb4-703dc054bf64" targetId="b513ac41-1f57-fee1-6f8f-e8be75290a02" linkType="profile">
+                      <modifiers/>
+                    </link>
+                  </links>
+                </entry>
+                <entry id="75a6dae4-e079-b6bb-4113-053c5ef0a3ae" name="3-4: Warp Flux" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false">
+                  <entries/>
+                  <entryGroups/>
+                  <modifiers/>
+                  <rules/>
+                  <profiles/>
+                  <links>
+                    <link id="2c9ab4bb-7b1a-21a4-49c2-bff3778366cc" targetId="e771065e-e3d1-f6a0-8581-1be19f8e547f" linkType="profile">
+                      <modifiers/>
+                    </link>
+                  </links>
+                </entry>
+                <entry id="c5ed6f1c-f29a-e7a4-c72c-8beaaa9e8977" name="5-6: Unnatural Vigour" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false">
+                  <entries/>
+                  <entryGroups/>
+                  <modifiers/>
+                  <rules/>
+                  <profiles/>
+                  <links>
+                    <link id="8d603485-7aca-8d88-4123-1508d67aee4b" targetId="58a663f0-4a0f-9787-abb4-0685e80f0e1d" linkType="profile">
+                      <modifiers/>
+                    </link>
+                  </links>
+                </entry>
+              </entries>
               <entryGroups/>
               <modifiers/>
               <rules/>
               <profiles/>
-              <links>
-                <link id="3a5bdf72-42c2-8ecf-8506-0b43f421fc15" targetId="b48e3b74-3e33-827a-c367-72996281ad32" linkType="profile">
-                  <modifiers/>
-                </link>
-                <link id="b65dc4f3-b71a-8dc2-9a7b-39e63fccae8c" targetId="024c79a3-48d4-03cc-8d50-7979e3f2f58b" linkType="rule">
-                  <modifiers/>
-                </link>
-                <link id="f83e2c4c-6a8c-af4e-6c5d-3951111b15ca" targetId="b20afe1b-5f12-4250-ef66-66f047ebeb36" linkType="rule">
-                  <modifiers/>
-                </link>
-              </links>
+              <links/>
             </entry>
           </entries>
           <entryGroups/>
@@ -18871,7 +18925,7 @@
     <rule id="521fb0b8-870d-f3e9-6f25-483767d3b77e" name="Daemonic Instability" hidden="false" book="Codex: Chaos Daemons" page="26">
       <modifiers/>
     </rule>
-    <rule id="c04f75e0-8faa-322a-64f0-7ab58d3af0c6" name="Daemonic Lord" hidden="false" book="Imperial Armour 13" page="197">
+    <rule id="c04f75e0-8faa-322a-64f0-7ab58d3af0c6" name="Daemon Lord" hidden="false" book="Imperial Armour 13" page="197">
       <modifiers/>
     </rule>
     <rule id="4a7d1539-37ad-9246-8153-10283bd14da6" name="Daemonic Resilience" hidden="false" book="Imperial Armour 13" page="191">
@@ -19216,6 +19270,9 @@
     <rule id="cf911112-d237-5b26-6843-9a04f852c720" name="Rampage" hidden="false" book="Warhammer 40k rulebook" page="0">
       <modifiers/>
     </rule>
+    <rule id="dffd9688-0124-fbc7-2cb8-8088a84351fd" name="Random Attacks" hidden="false" book="Imperial Armour 13" page="160">
+      <modifiers/>
+    </rule>
     <rule id="36092205-0364-6fbd-5e0b-1d479d3c8674" name="Random Attacks (Giant Chaos Spawn)" hidden="false" book="Imperial Armour 13" page="201">
       <modifiers/>
     </rule>
@@ -19402,13 +19459,10 @@
     <rule id="2486ab82-ce74-402f-411b-1968201d4a69" name="Warp Plague" hidden="false" book="Imperial Armour 13" page="165">
       <modifiers/>
     </rule>
-    <rule id="5644e67e-b2e9-dc98-dcaa-fedd25edbb45" name="Zealot" hidden="false" book="Warhammer 40k rulebook" page="0">
-      <modifiers/>
-    </rule>
-    <rule id="dffd9688-0124-fbc7-2cb8-8088a84351fd" name="Random Attacks" hidden="false" book="Imperial Armour 13" page="160">
+    <rule id="1a4d68b2-334f-f00f-29c2-34f9a81d5df7" name="Warpflame" hidden="false" book="Codex: Chaos Daemons" page="68">
       <modifiers/>
     </rule>
-    <rule id="1a4d68b2-334f-f00f-29c2-34f9a81d5df7" name="Warpflame" hidden="false" book="Codex: Chaos Daemons" page="68">
+    <rule id="5644e67e-b2e9-dc98-dcaa-fedd25edbb45" name="Zealot" hidden="false" book="Warhammer 40k rulebook" page="0">
       <modifiers/>
     </rule>
   </sharedRules>
@@ -21460,18 +21514,45 @@
       </characteristics>
       <modifiers/>
     </profile>
+    <profile id="1589be0b-fcc4-77ed-b8b1-e55b4e487cef" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Bolt of Change" hidden="false" book="Codex: Chaos Daemons" page="68">
+      <characteristics>
+        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="24"/>
+        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="D6+4"/>
+        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="2"/>
+        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Beam, Warp Charge 1, Assault 1, Warpflame"/>
+      </characteristics>
+      <modifiers/>
+    </profile>
     <profile id="b513ac41-1f57-fee1-6f8f-e8be75290a02" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" name="Psychic - Creeping Terror" hidden="false" book="Imperial Armour 13" page="155">
       <characteristics>
         <characteristic characteristicId="21befb24-fc85-4f52-a745-64b2e48f8228" name="Description" value="Malediction, Warp Charge 1, targets a single enemy unit within 12&quot;. The target unit has I1 and may only fire Snap Shots until the end of that unit&apos;s next turn. Units with Fearless are unaffected.Units with And They Shall Know No Fear, or Stubborn, may attempt an Ld test to ignore the effects if they pass."/>
       </characteristics>
       <modifiers/>
     </profile>
+    <profile id="ae0defc7-4784-0c92-7fd0-06aa28d03511" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Flickering Fire of Tzeentch" hidden="false" book="Codex: Chaos Daemons" page="68">
+      <characteristics>
+        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="24"/>
+        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="5"/>
+        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="4"/>
+        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Witchfire, Warp Charge 1-3, Assault 2D6, Soul Blaze, Warpflame"/>
+      </characteristics>
+      <modifiers/>
+    </profile>
     <profile id="0b9a8e86-3b8b-eb0f-a0b9-8d52529a8a28" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" name="Psychic - Gift of Contagion" hidden="false" book="Codex: Chaos Space Marines" page="71">
       <characteristics>
         <characteristic characteristicId="21befb24-fc85-4f52-a745-64b2e48f8228" name="Description" value="Malediction, Warp Charge 1, affects a single enemy unit within 48&quot;. Roll D3 for the effect on every model in the unit whilst the power is in effect. Multiple effects are cumulative. 1: Flyblown Palsy: -1A and Shrouded. 2: Muscular Atrophy: -1S and may not Run. 3: Liquefying Ague: -1S and -1T."/>
       </characteristics>
       <modifiers/>
     </profile>
+    <profile id="a4a2f21a-305b-306e-8eb7-33f2f32fa0c6" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Infernal Gateway" hidden="false" book="Codex: Chaos Daemons" page="68">
+      <characteristics>
+        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="18"/>
+        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="D6+4"/>
+        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="1"/>
+        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Witchfire, Warp Charge 2, Assault 1, 3&quot; Blast, Warpflame"/>
+      </characteristics>
+      <modifiers/>
+    </profile>
     <profile id="db02f73c-790e-4ba2-face-374feb4b7f99" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Nurgle&apos;s Rot" hidden="false" book="Codex: Chaos Space Marines" page="71">
       <characteristics>
         <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="6"/>
@@ -21481,6 +21562,15 @@
       </characteristics>
       <modifiers/>
     </profile>
+    <profile id="08a5ba3c-6abf-e0be-b167-4aaea4488f43" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Tzeentch&apos;s Firestorm" hidden="false" book="Codex: Chaos Daemons" page="68">
+      <characteristics>
+        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="24"/>
+        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="D6+1"/>
+        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="-"/>
+        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Witchfire, Warp Charge 1, Assault 1, 3&quot; Blast, Warpflame"/>
+      </characteristics>
+      <modifiers/>
+    </profile>
     <profile id="58a663f0-4a0f-9787-abb4-0685e80f0e1d" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82" name="Psychic - Unnatural Vigour" hidden="false" book="Imperial Armour 13" page="155">
       <characteristics>
         <characteristic characteristicId="21befb24-fc85-4f52-a745-64b2e48f8228" name="Description" value="Blessing, Warp Charge 1, may target any friendly unit within 12&quot;. Unit affected gains Fleet and Crusader for the duration."/>
@@ -22274,41 +22364,5 @@
       </characteristics>
       <modifiers/>
     </profile>
-    <profile id="08a5ba3c-6abf-e0be-b167-4aaea4488f43" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Tzeentch&apos;s Firestorm" hidden="false" book="Codex: Chaos Daemons" page="68">
-      <characteristics>
-        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="24"/>
-        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="D6+1"/>
-        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="-"/>
-        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Witchfire, Warp Charge 1, Assault 1, 3&quot; Blast, Warpflame"/>
-      </characteristics>
-      <modifiers/>
-    </profile>
-    <profile id="1589be0b-fcc4-77ed-b8b1-e55b4e487cef" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Bolt of Change" hidden="false" book="Codex: Chaos Daemons" page="68">
-      <characteristics>
-        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="24"/>
-        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="D6+4"/>
-        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="2"/>
-        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Beam, Warp Charge 1, Assault 1, Warpflame"/>
-      </characteristics>
-      <modifiers/>
-    </profile>
-    <profile id="ae0defc7-4784-0c92-7fd0-06aa28d03511" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Flickering Fire of Tzeentch" hidden="false" book="Codex: Chaos Daemons" page="68">
-      <characteristics>
-        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="24"/>
-        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="5"/>
-        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="4"/>
-        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Witchfire, Warp Charge 1-3, Assault 2D6, Soul Blaze, Warpflame"/>
-      </characteristics>
-      <modifiers/>
-    </profile>
-    <profile id="a4a2f21a-305b-306e-8eb7-33f2f32fa0c6" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48" name="Psychic - Infernal Gateway" hidden="false" book="Codex: Chaos Daemons" page="68">
-      <characteristics>
-        <characteristic characteristicId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" name="Range" value="18"/>
-        <characteristic characteristicId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" name="Strength" value="D6+4"/>
-        <characteristic characteristicId="6abee736-f8d3-498e-97ac-a5c68445609f" name="AP" value="1"/>
-        <characteristic characteristicId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" name="Type" value="Witchfire, Warp Charge 2, Assault 1, 3&quot; Blast, Warpflame"/>
-      </characteristics>
-      <modifiers/>
-    </profile>
   </sharedProfiles>
 </catalogue>
\ No newline at end of file