diff --git a/Chaos - Questor Traitoris.cat b/Chaos - Questor Traitoris.cat
index dca9c51b2e..b59b1717dc 100644
--- a/Chaos - Questor Traitoris.cat	
+++ b/Chaos - Questor Traitoris.cat	
@@ -1,76 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="5d84-5102-f22c-14d4" name="Chaos - Renegade Knights" book="Chapter Approved: 2018" revision="14" battleScribeVersion="2.01" authorName="Mad-Spy" authorContact="https://gitter.im/BSData/wh40k" authorUrl="https://github.com/BSData/wh40k/issues" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="5d84-5102-f22c-14d4" name="Chaos - Renegade Knights" book="Chapter Approved: 2018" revision="15" battleScribeVersion="2.01" authorName="Mad-Spy" authorContact="https://gitter.im/BSData/wh40k" authorUrl="https://github.com/BSData/wh40k/issues" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
   <costTypes/>
   <profileTypes/>
-  <categoryEntries>
-    <categoryEntry id="2663-fe63-14ce-fd31" name="Questor Traitoris" hidden="false">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <constraints/>
-    </categoryEntry>
-  </categoryEntries>
-  <forceEntries>
-    <forceEntry id="c858-1e59-55a8-1a2a" name="Questor Traitoris Super-Heavy Detachment" hidden="false">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers>
-        <modifier type="set" field="name" value="Questor Traitoris Super-Heavy Detachment +6CP">
-          <repeats/>
-          <conditions>
-            <condition field="selections" scope="force" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bdda-36f0-4f32-1639" type="greaterThan"/>
-          </conditions>
-          <conditionGroups/>
-        </modifier>
-        <modifier type="set" field="name" value="Questor Traitoris Super-Heavy Detachment +3CP">
-          <repeats/>
-          <conditions/>
-          <conditionGroups>
-            <conditionGroup type="and">
-              <conditions>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bdda-36f0-4f32-1639" type="greaterThan"/>
-                <condition field="selections" scope="force" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="bdda-36f0-4f32-1639" type="lessThan"/>
-              </conditions>
-              <conditionGroups/>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-      </modifiers>
-      <constraints/>
-      <forceEntries/>
-      <categoryLinks>
-        <categoryLink id="7391-77e3-6b05-a3f6" name="Lord of War" hidden="false" targetId="c888f08a-6cea-4a01-8126-d374a9231554" primary="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="force" value="3.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="86f9-c802-aa13-40ad" type="min"/>
-            <constraint field="selections" scope="force" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="41b6-bb10-5668-e5ec" type="max"/>
-          </constraints>
-        </categoryLink>
-        <categoryLink id="bc25-6958-4314-4fd1" name="No Force Org Slot" hidden="false" targetId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" primary="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints/>
-        </categoryLink>
-        <categoryLink id="be4d-f1f2-7be9-96dc" name="Warlord" hidden="false" targetId="ae09-117e-a6fa-316b" primary="false">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints/>
-        </categoryLink>
-      </categoryLinks>
-    </forceEntry>
-  </forceEntries>
+  <categoryEntries/>
+  <forceEntries/>
   <selectionEntries/>
   <entryLinks>
     <entryLink id="cddc-4795-c524-307d" name="Renegade Knight" hidden="false" targetId="be75-0c89-4566-f22a" type="selectionEntry">
@@ -284,7 +220,7 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="aa75-97be-386f-4bc4" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="17ce-6a51-ad67-e87f" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -497,6 +433,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="25.0"/>
         <cost name="pts" costTypeId="points" value="285.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a37d-3bc1-1d6b-1706" name="Reaper chainsword" hidden="false" collective="false" type="upgrade">
@@ -527,6 +464,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
         <cost name="pts" costTypeId="points" value="30.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5854-21d1-1a2d-d4fc" name="Thunderstrike gauntlet" hidden="false" collective="false" type="upgrade">
@@ -557,6 +495,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
         <cost name="pts" costTypeId="points" value="35.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a305-be8c-917a-7884" name="Hekaton siege claw" book="" hidden="false" collective="false" type="upgrade">
@@ -599,6 +538,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="30.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="1.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e322-2ffa-27e7-c6d4" name="Tempest warblade" hidden="false" collective="false" type="upgrade">
@@ -629,6 +569,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="30.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4e07-76d8-c5b1-aa70" name="Reaper chainfist" hidden="false" collective="false" type="upgrade">
@@ -671,6 +612,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="40.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="15ec-607f-8a15-9453" name="Cerastus shock lance" hidden="false" collective="false" type="upgrade">
@@ -701,6 +643,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="60.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="1e9f-db20-fcef-d938" name="Hellburner chieorovile" hidden="false" collective="false" type="upgrade">
@@ -731,6 +674,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="80.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6405-dd3b-a0d0-333e" name="Graviton crusher" hidden="false" collective="false" type="upgrade">
@@ -761,6 +705,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="25.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="674b-2a99-0d7b-534e" name="Twin rad cleanser" hidden="false" collective="false" type="upgrade">
@@ -791,6 +736,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="25.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c5e3-0e2b-e707-4697" name="Twin magna lascannon" hidden="false" collective="false" type="upgrade">
@@ -821,6 +767,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="100.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5427-4147-1a10-4d30" name="Ironstorm missile pod" hidden="false" collective="false" type="upgrade">
@@ -851,6 +798,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="16.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e4d2-f467-8838-89eb" name="Helios defence missiles" hidden="false" collective="false" type="upgrade">
@@ -881,6 +829,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="45.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="71d1-47ba-a904-6baa" name="Lightning cannon" hidden="false" collective="false" type="upgrade">
@@ -911,6 +860,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="70.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3db7-9e03-af78-f5fe" name="Ectoplasma fusil" hidden="false" collective="false" type="upgrade">
@@ -941,6 +891,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="20.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="de4c-2e69-bae5-256f" name="Atropos lascutter" hidden="false" collective="false" type="upgrade">
@@ -985,6 +936,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="80.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7bd6-8dbc-f30d-962c" name="Graviton singularity cannon" hidden="false" collective="false" type="upgrade">
@@ -1015,6 +967,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="70.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0868-897b-b283-300f" name="Castigator bolt cannon" hidden="false" collective="false" type="upgrade">
@@ -1045,6 +998,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="50.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="bf62-0525-c30f-35b7" name="Shock blast" hidden="false" collective="false" type="upgrade">
@@ -1075,6 +1029,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
         <cost name="pts" costTypeId="points" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2bdf-19d0-4cf9-4ee1" name="Acheron flame cannon" hidden="false" collective="false" type="upgrade">
@@ -1105,6 +1060,7 @@
       <costs>
         <cost name="pts" costTypeId="points" value="80.0"/>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="92d3-1e38-f536-520c" name="Renegade Knight Acheron" hidden="false" collective="false" type="model">
@@ -1239,7 +1195,7 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="04b4-812a-0bf7-4a05" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="48d0-41d3-69c3-3422" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -1368,6 +1324,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="25.0"/>
         <cost name="pts" costTypeId="points" value="358.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="acfc-87f8-2dac-8c5d" name="Renegade Knight Lancer" hidden="false" collective="false" type="model">
@@ -1502,7 +1459,7 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="45c7-00fb-a218-a310" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="5c52-ffc0-99a4-7a29" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -1631,6 +1588,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="24.0"/>
         <cost name="pts" costTypeId="points" value="360.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7298-33a5-8120-0221" name="Renegade Knight Castigator" hidden="false" collective="false" type="model">
@@ -1765,7 +1723,7 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="c78b-456c-4e4a-4392" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="cdb8-4376-60cc-5f42" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -1894,6 +1852,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="25.0"/>
         <cost name="pts" costTypeId="points" value="350.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="cfa7-5682-a816-71aa" name="Renegade Knight Atropos" hidden="false" collective="false" type="model">
@@ -2046,7 +2005,7 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="0d88-e419-3357-bf6f" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="d8d8-d021-ce2c-fe48" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -2175,6 +2134,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="29.0"/>
         <cost name="pts" costTypeId="points" value="405.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f140-7a44-d508-5b7e" name="Renegade Knight Magaera" hidden="false" collective="false" type="model">
@@ -2312,7 +2272,7 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="9af7-472c-62a7-0865" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="860a-9af7-3e7a-48ad" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -2473,6 +2433,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="28.0"/>
         <cost name="pts" costTypeId="points" value="380.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f958-1af0-8344-b277" name="Renegade Knight Porphyrion" hidden="false" collective="false" type="model">
@@ -2613,7 +2574,7 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="e66f-06e8-aac2-cf9c" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="f6d7-a315-35d5-879e" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -2794,6 +2755,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="40.0"/>
         <cost name="pts" costTypeId="points" value="600.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="efc4-53b7-43d7-0668" name="Renegade Knight Styrix" hidden="false" collective="false" type="model">
@@ -2931,7 +2893,7 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="89c3-4d1a-d14b-7c52" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="7a84-d23f-80e2-8c74" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -3092,6 +3054,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="24.0"/>
         <cost name="pts" costTypeId="points" value="340.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2d4b-5f29-08c1-277e" name="Renegade Knight Dominus" hidden="false" collective="false" type="model">
@@ -3210,14 +3173,14 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="2e08-56fb-6c70-7ea2" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="d119-b5a2-ffcd-5e41" name="New CategoryLink" hidden="false" targetId="bdda-36f0-4f32-1639" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="d119-b5a2-ffcd-5e41" name="New CategoryLink" hidden="false" targetId="bdda-36f0-4f32-1639" primary="false">
+        <categoryLink id="4bbb-0bdd-1688-a39e" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -3257,6 +3220,7 @@
           <costs>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
             <cost name="pts" costTypeId="points" value="0.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3328,6 +3292,7 @@
               <costs>
                 <cost name="pts" costTypeId="points" value="10.0"/>
                 <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+                <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="8df4-dfee-1501-24f9" name="Conflagration cannon and Thundercoil harpoon" hidden="false" collective="false" type="upgrade">
@@ -3372,6 +3337,7 @@
               <costs>
                 <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
                 <cost name="pts" costTypeId="points" value="0.0"/>
+                <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -3426,6 +3392,7 @@
               <costs>
                 <cost name="pts" costTypeId="points" value="35.0"/>
                 <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+                <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="d362-3935-0e2b-92fe" name="Two Shieldbreaker missiles" hidden="false" collective="false" type="upgrade">
@@ -3459,6 +3426,7 @@
               <costs>
                 <cost name="pts" costTypeId="points" value="24.0"/>
                 <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+                <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -3599,6 +3567,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="30.0"/>
         <cost name="pts" costTypeId="points" value="500.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b873-b5d1-e25a-0b35" name="Titanic feet" hidden="false" collective="false" type="upgrade">
@@ -3624,6 +3593,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
         <cost name="pts" costTypeId="points" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b675-742d-5675-6311" name="Renegade Armigers" hidden="false" collective="false" type="unit">
@@ -3650,21 +3620,21 @@
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="bada-9a35-8b7b-4abe" name="New CategoryLink" hidden="false" targetId="2663-fe63-14ce-fd31" primary="false">
+        <categoryLink id="b8f8-da1b-a10c-7544" name="New CategoryLink" hidden="false" targetId="c8fd-783f-3230-493e" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="b8f8-da1b-a10c-7544" name="New CategoryLink" hidden="false" targetId="c8fd-783f-3230-493e" primary="false">
+        <categoryLink id="a60a-8e06-adfc-f4c3" name="New CategoryLink" hidden="false" targetId="c888f08a-6cea-4a01-8126-d374a9231554" primary="true">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers/>
           <constraints/>
         </categoryLink>
-        <categoryLink id="a60a-8e06-adfc-f4c3" name="New CategoryLink" hidden="false" targetId="c888f08a-6cea-4a01-8126-d374a9231554" primary="true">
+        <categoryLink id="4d47-8542-b226-d19a" name="Faction: Questor Traitoris" hidden="false" targetId="1481-ffc3-f85a-eb36" primary="false">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -3803,6 +3773,7 @@
                   <costs>
                     <cost name="pts" costTypeId="points" value="10.0"/>
                     <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+                    <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
                   </costs>
                 </selectionEntry>
                 <selectionEntry id="b388-5fbe-061b-129f" name="Thermal spear and Reaper chain-cleaver" hidden="false" collective="false" type="upgrade">
@@ -3861,6 +3832,7 @@
                   <costs>
                     <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
                     <cost name="pts" costTypeId="points" value="0.0"/>
+                    <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -3988,6 +3960,7 @@
           <costs>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="9.0"/>
             <cost name="pts" costTypeId="points" value="160.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3996,25 +3969,17 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
         <cost name="pts" costTypeId="points" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="75b0-25e5-2828-0125" name="Character" hidden="false" collective="false" type="upgrade">
       <profiles/>
       <rules/>
       <infoLinks/>
-      <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <repeats/>
-          <conditions>
-            <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c858-1e59-55a8-1a2a" type="notInstanceOf"/>
-          </conditions>
-          <conditionGroups/>
-        </modifier>
-      </modifiers>
+      <modifiers/>
       <constraints>
         <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="e443-6545-e4bd-a998" type="max"/>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7ed0-0061-544b-5167" type="max"/>
-        <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="ea87-09df-2fad-8542" type="min"/>
       </constraints>
       <categoryLinks>
         <categoryLink id="960b-e431-35a8-0f9b" name="New CategoryLink" hidden="false" targetId="ef18-746a-369f-43a4" primary="false">
@@ -4031,6 +3996,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
         <cost name="pts" costTypeId="points" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c50f-9cc4-a751-6707" name="Warlord" hidden="false" collective="false" type="upgrade">
@@ -4065,6 +4031,7 @@
       <costs>
         <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
         <cost name="pts" costTypeId="points" value="0.0"/>
+        <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
       </costs>
     </selectionEntry>
   </sharedSelectionEntries>
@@ -4107,6 +4074,7 @@
           <costs>
             <cost name="pts" costTypeId="points" value="16.0"/>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="a942-6153-4eb5-57c5" name="Stormspear Rocket Pod" hidden="false" collective="false" type="upgrade">
@@ -4137,6 +4105,7 @@
           <costs>
             <cost name="pts" costTypeId="points" value="45.0"/>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="539f-e8fa-de7c-064d" name="Twin Icarus Autocannon" hidden="false" collective="false" type="upgrade">
@@ -4167,6 +4136,7 @@
           <costs>
             <cost name="pts" costTypeId="points" value="20.0"/>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4222,6 +4192,7 @@
               <costs>
                 <cost name="pts" costTypeId="points" value="75.0"/>
                 <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+                <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4242,6 +4213,7 @@
           <costs>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
             <cost name="pts" costTypeId="points" value="0.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="9633-a6da-36df-de8e" name="Rapid-fire battle cannon and heavy stubber" hidden="false" collective="false" type="upgrade">
@@ -4283,6 +4255,7 @@
               <costs>
                 <cost name="pts" costTypeId="points" value="100.0"/>
                 <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
+                <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4303,6 +4276,7 @@
           <costs>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
             <cost name="pts" costTypeId="points" value="0.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="4871-302d-a180-53f4" name="Thermal cannon" hidden="false" collective="false" type="upgrade">
@@ -4333,6 +4307,7 @@
           <costs>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
             <cost name="pts" costTypeId="points" value="76.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4390,6 +4365,7 @@
           <costs>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
             <cost name="pts" costTypeId="points" value="0.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4462,6 +4438,7 @@
           <costs>
             <cost name=" PL" costTypeId="e356-c769-5920-6e14" value="0.0"/>
             <cost name="pts" costTypeId="points" value="0.0"/>
+            <cost name="CP" costTypeId="2d3b-b544-ad49-fb75" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
diff --git a/Warhammer 40,000 8th Edition.gst b/Warhammer 40,000 8th Edition.gst
index a64aec6caf..698440ee0a 100644
--- a/Warhammer 40,000 8th Edition.gst	
+++ b/Warhammer 40,000 8th Edition.gst	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<gameSystem id="28ec-711c-d87f-3aeb" name="Warhammer 40,000 8th Edition" revision="92" battleScribeVersion="2.01" authorName="BSData Organisation" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
+<gameSystem id="28ec-711c-d87f-3aeb" name="Warhammer 40,000 8th Edition" revision="93" battleScribeVersion="2.01" authorName="BSData Organisation" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" xmlns="http://www.battlescribe.net/schema/gameSystemSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -452,6 +452,13 @@
       <modifiers/>
       <constraints/>
     </categoryEntry>
+    <categoryEntry id="1481-ffc3-f85a-eb36" name="Faction: Questor Traitoris" hidden="false">
+      <profiles/>
+      <rules/>
+      <infoLinks/>
+      <modifiers/>
+      <constraints/>
+    </categoryEntry>
   </categoryEntries>
   <forceEntries>
     <forceEntry id="a0c7-2a71-bae0-215d" name="Patrol Detachment" hidden="false">
@@ -12472,9 +12479,16 @@
                 <conditionGroup type="and">
                   <conditions>
                     <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bdda-36f0-4f32-1639" type="lessThan"/>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0116-d165-23e1-4e90" type="greaterThan"/>
                   </conditions>
-                  <conditionGroups/>
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0116-d165-23e1-4e90" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="1481-ffc3-f85a-eb36" type="greaterThan"/>
+                      </conditions>
+                      <conditionGroups/>
+                    </conditionGroup>
+                  </conditionGroups>
                 </conditionGroup>
               </conditionGroups>
             </conditionGroup>
@@ -12490,9 +12504,16 @@
                 <conditionGroup type="and">
                   <conditions>
                     <condition field="selections" scope="force" value="2.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bdda-36f0-4f32-1639" type="greaterThan"/>
-                    <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0116-d165-23e1-4e90" type="greaterThan"/>
                   </conditions>
-                  <conditionGroups/>
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="1481-ffc3-f85a-eb36" type="greaterThan"/>
+                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="0116-d165-23e1-4e90" type="greaterThan"/>
+                      </conditions>
+                      <conditionGroups/>
+                    </conditionGroup>
+                  </conditionGroups>
                 </conditionGroup>
                 <conditionGroup type="and">
                   <conditions>