diff --git a/Aeldari - Craftworlds.cat b/Aeldari - Craftworlds.cat
index e0fd85b75c..5b67bd4218 100644
--- a/Aeldari - Craftworlds.cat	
+++ b/Aeldari - Craftworlds.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="30b2-6f64-b85e-b4dc" name="Aeldari - Craftworlds" revision="151" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@FarseerV @WindstormSCR" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="208" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="30b2-6f64-b85e-b4dc" name="Aeldari - Craftworlds" revision="152" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@FarseerV @WindstormSCR" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="208" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="30b2-6f64-pubN137513" name="Codex: Craftworlds"/>
   </publications>
@@ -3763,7 +3763,6 @@ Add 1 to the Leadership characteristic of models in this unit.</characteristic>
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="7d93-78f1-3e13-3b39" type="atLeast"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="580b-4691-eb5b-b044" type="atLeast"/>
               </conditions>
@@ -6707,7 +6706,6 @@ If this unit&apos;s Dark Reaper Exarch model is equipped with an Aeldari Missile
     </selectionEntry>
     <selectionEntry id="c400-a060-dd8f-0df3" name="Wraithknight" publicationId="1f62-db93-63f4-4dc7" page="178" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="hidden" value="true"/>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
             <conditionGroup type="or">
@@ -10827,6 +10825,15 @@ Make sure to obtain opponent consent before using this option, as it is no longe
             <condition field="selections" scope="d1f1-5687-8d44-f038" value="6.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" type="greaterThan"/>
           </conditions>
         </modifier>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5af8-e7c8-e3bf-6d52" type="atLeast"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
       <infoLinks>
         <infoLink id="179a-15ab-6862-c15c" name="Reavers of the Void" hidden="false" targetId="3a66-aac2-31bc-f585" type="profile"/>
@@ -11302,6 +11309,15 @@ Make sure to obtain opponent consent before using this option, as it is no longe
             <condition field="selections" scope="b126-3f3e-c064-cbb6" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" type="greaterThan"/>
           </conditions>
         </modifier>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5af8-e7c8-e3bf-6d52" type="atLeast"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
       <infoLinks>
         <infoLink id="ef14-9c23-18e9-2eeb" name="Reavers of the Void" hidden="false" targetId="3a66-aac2-31bc-f585" type="profile"/>
diff --git a/Aeldari - Drukhari.cat b/Aeldari - Drukhari.cat
index cd7814e2ab..c25768a879 100644
--- a/Aeldari - Drukhari.cat	
+++ b/Aeldari - Drukhari.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="e0a4-2172-4397-e39a" name="Aeldari - Drukhari" revision="143" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@WindstormSCR @FarseerV" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="206" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="e0a4-2172-4397-e39a" name="Aeldari - Drukhari" revision="145" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@WindstormSCR @FarseerV" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="208" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="e0a4-2172-pubN65537" name="Codex: Drukhari"/>
     <publication id="d36f-0c87-284a-7055" name="Warhammer Legends - Drukhari"/>
@@ -123,21 +123,21 @@
     </entryLink>
     <entryLink id="b9b4-b3d6-589c-b694" name="Haemonculus" hidden="false" collective="false" import="true" targetId="bcaa-5a3b-de61-6f41" type="selectionEntry">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
-          </conditions>
-        </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fc1-0bf5-caf9-3702" type="equalTo"/>
           </conditions>
         </modifier>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
     </entryLink>
     <entryLink id="3737-f109-c934-f294" name="Kabalite Warriors" hidden="false" collective="false" import="true" targetId="40a0-6ba1-e19a-1c60" type="selectionEntry">
@@ -158,7 +158,7 @@
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
           </conditions>
         </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
@@ -230,14 +230,14 @@
     <entryLink id="fd41-cc95-81b9-9bf4" name="Wracks" hidden="false" collective="false" import="true" targetId="870e-ddec-7fd6-366a" type="selectionEntry">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
-          </conditions>
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
           <conditions>
@@ -275,7 +275,7 @@
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
           </conditions>
         </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
@@ -287,40 +287,40 @@
     </entryLink>
     <entryLink id="12e5-faa7-4331-ea43" name="Cronos" hidden="false" collective="false" import="true" targetId="1924-94b3-98a7-eb5d" type="selectionEntry">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
-          </conditions>
-        </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fc1-0bf5-caf9-3702" type="equalTo"/>
           </conditions>
         </modifier>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
     </entryLink>
     <entryLink id="d4fe-914e-5c9d-768b" name="Grotesques" hidden="false" collective="false" import="true" targetId="6897-8b55-f703-7d4e" type="selectionEntry">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
-          </conditions>
-        </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fc1-0bf5-caf9-3702" type="equalTo"/>
           </conditions>
         </modifier>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
     </entryLink>
     <entryLink id="d8f4-094c-5682-f01f" name="Hekatrix Bloodbrides" hidden="false" collective="false" import="true" targetId="1a60-f7ac-212f-41be" type="selectionEntry">
@@ -354,7 +354,7 @@
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
           </conditions>
         </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
@@ -366,35 +366,40 @@
     </entryLink>
     <entryLink id="c6b1-f56a-453d-2856" name="Kabalite Trueborn" hidden="false" collective="false" import="true" targetId="8435-5bf3-35df-85a7" type="selectionEntry">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
-          </conditions>
-        </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fc1-0bf5-caf9-3702" type="equalTo"/>
           </conditions>
         </modifier>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
     </entryLink>
     <entryLink id="d4f0-83f2-ff11-6047" name="Talos" hidden="false" collective="false" import="true" targetId="3166-b10d-e54e-f46d" type="selectionEntry">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
-          </conditions>
-        </modifier>
-        <modifier type="set" field="hidden" value="true">
-          <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
-          </conditions>
-        </modifier>
         <modifier type="add" field="category" value="fd18-5d03-2a29-9dc7">
           <conditions>
             <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5fc1-0bf5-caf9-3702" type="equalTo"/>
           </conditions>
         </modifier>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
     </entryLink>
     <entryLink id="14de-f068-353e-c62d" name="Urien Rakarth" hidden="false" collective="false" import="true" targetId="afb9-7509-4ba6-c415" type="selectionEntry">
@@ -403,7 +408,7 @@
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
+                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ebb3-4f37-6e57-7a8e" type="atLeast"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2538-0722-fa84-1db3" type="equalTo"/>
               </conditions>
             </conditionGroup>
@@ -499,7 +504,6 @@
       </categoryLinks>
     </entryLink>
     <entryLink id="68ea-6051-ef3e-9a69" name="Stratagem: Prizes from the Dark City" hidden="false" collective="false" import="true" targetId="5b96-79e6-8d10-f8a8" type="selectionEntry"/>
-    <entryLink id="c54e-4df0-1fc3-720a" name="Webway Gate" hidden="false" collective="false" import="true" targetId="52c2-f7a8-dc21-d14d" type="selectionEntry"/>
     <entryLink id="d13e-9d97-7915-b27d" name="Raiding Forces - CP Refund" hidden="false" collective="false" import="true" targetId="acd3-5c50-c5a5-eb5e" type="selectionEntry"/>
     <entryLink id="1e85-4f70-59a0-7e47" name="Raven Strike Fighter [Legends]" hidden="false" collective="false" import="true" targetId="d083-1adc-1385-58b4" type="selectionEntry">
       <modifiers>
@@ -744,7 +748,6 @@
         <categoryLink id="4dfd-f8ed-7f39-4699" name="New CategoryLink" hidden="false" targetId="ef18-746a-369f-43a4" primary="false"/>
         <categoryLink id="070b-221d-63fd-c835" name="New CategoryLink" hidden="false" targetId="848a6ff2-0def-4c72-8433-ff7da70e6bc7" primary="true"/>
         <categoryLink id="cd72-7d12-4868-8fe5" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
-        <categoryLink id="a15e-b30b-51ad-af00" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="2ba5-3be1-2f7e-1c77" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="47d0-a86d-4250-3710" name="Archon" hidden="false" targetId="0fa5-c739-c66f-3d88" primary="false"/>
       </categoryLinks>
@@ -979,7 +982,6 @@
         <categoryLink id="a41d-078b-986a-286f" name="New CategoryLink" hidden="false" targetId="848a6ff2-0def-4c72-8433-ff7da70e6bc7" primary="true"/>
         <categoryLink id="186e-5077-610d-c8b1" name="New CategoryLink" hidden="false" targetId="ef18-746a-369f-43a4" primary="false"/>
         <categoryLink id="923d-0d67-e380-5a17" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
-        <categoryLink id="1728-f17c-3c77-c9f9" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="8274-cff0-5d13-51fd" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="b688-5ef1-4703-2bfb" name="Haemonculus" hidden="false" targetId="65d3-140a-2185-ef41" primary="false"/>
       </categoryLinks>
@@ -1082,7 +1084,6 @@
         <categoryLink id="7e8d-6310-9b15-e133" name="New CategoryLink" hidden="false" targetId="a6a2-680c-c64c-587a" primary="false"/>
         <categoryLink id="f980-bd91-876f-120f" name="New CategoryLink" hidden="false" targetId="5d76b6f5-20ae-4d70-8f59-ade72a2add3a" primary="true"/>
         <categoryLink id="237b-9eac-73aa-01ce" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
-        <categoryLink id="5613-7fda-8768-3f88" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="5db1-b56c-6537-52ae" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -1327,7 +1328,6 @@
         <categoryLink id="6b79-7cf6-838f-3ebf" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="c15c-8ea7-146a-29ca" name="New CategoryLink" hidden="false" targetId="a565-a5b4-4e95-2786" primary="false"/>
         <categoryLink id="47c9-d390-8756-847d" name="Blades For Hire" hidden="false" targetId="f2b5-6509-4476-4fa2" primary="false"/>
-        <categoryLink id="2c6d-5a06-aba0-bde9" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="82d5-7b03-9a61-5873" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -1557,7 +1557,6 @@
         <categoryLink id="f3f0-65da-10d5-6adf" name="New CategoryLink" hidden="false" targetId="6cc4-1b62-8e8a-05cd" primary="false"/>
         <categoryLink id="ab1d-0abd-cb91-9fcb" name="New CategoryLink" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
         <categoryLink id="938e-1df5-b48e-f6b9" name="New CategoryLink" hidden="false" targetId="465b-6b54-c2bf-cdd3" primary="false"/>
-        <categoryLink id="6d3c-426c-b48e-50a1" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="641b-d16a-d4c7-78cb" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -1702,7 +1701,6 @@
         <categoryLink id="866d-0cd9-8677-9ee6" name="Vehicle" hidden="false" targetId="c8fd-783f-3230-493e" primary="false"/>
         <categoryLink id="b44b-939c-f0b2-674e" name="Ravager" hidden="false" targetId="1018-59aa-c195-3ed9" primary="false"/>
         <categoryLink id="0559-60da-ae47-4f66" name="Faction: &lt;Kabal&gt;" hidden="false" targetId="105d-2b08-1dc3-2f69" primary="false"/>
-        <categoryLink id="5853-2821-865f-9fd7" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="a75a-5947-8623-6cdf" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -1814,7 +1812,6 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="3f45-fd3b-13a9-83a1" name="New CategoryLink" hidden="false" targetId="e888-1504-aa61-95ff" primary="true"/>
-        <categoryLink id="c50a-6e68-694a-579e" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="c8f3-93c2-3dba-2161" name="Vehicle" hidden="false" targetId="c8fd-783f-3230-493e" primary="false"/>
         <categoryLink id="bb3a-f196-68d3-8d86" name="Fly" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
         <categoryLink id="e170-d9c4-1618-2218" name="Aircraft" hidden="false" targetId="d569-3d56-cd24-6a31" primary="false"/>
@@ -2006,7 +2003,6 @@
         <categoryLink id="c98b-c442-7890-f27d" name="New CategoryLink" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
         <categoryLink id="ee4e-9198-9533-78ea" name="New CategoryLink" hidden="false" targetId="4ee8-ef24-8efb-948e" primary="false"/>
         <categoryLink id="511e-0e0d-7324-3e42" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
-        <categoryLink id="8f2f-440f-8136-12e5" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="f08b-6466-1886-c05b" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -2386,7 +2382,6 @@
         <categoryLink id="8e56-3412-26f6-8856" name="New CategoryLink" hidden="false" targetId="848a6ff2-0def-4c72-8433-ff7da70e6bc7" primary="true"/>
         <categoryLink id="a240-2cba-b0d6-717e" name="New CategoryLink" hidden="false" targetId="ef18-746a-369f-43a4" primary="false"/>
         <categoryLink id="e8d7-96e0-c64b-32c0" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
-        <categoryLink id="63ab-2cc7-d8f2-0c42" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="05f1-77ae-7b86-0832" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="b91e-df3a-6105-560d" name="Succubus" hidden="false" targetId="ef20-5196-feb6-f23d" primary="false"/>
       </categoryLinks>
@@ -2568,7 +2563,6 @@
         <categoryLink id="9984-9270-0fe6-5b9f" name="New CategoryLink" hidden="false" targetId="6cc4-1b62-8e8a-05cd" primary="false"/>
         <categoryLink id="f9fc-6c80-b039-147d" name="New CategoryLink" hidden="false" targetId="2f02-a00c-0e9e-39fc" primary="false"/>
         <categoryLink id="e9e9-8dee-195e-faf2" name="New CategoryLink" hidden="false" targetId="c8fd-783f-3230-493e" primary="false"/>
-        <categoryLink id="42bd-219a-4de4-7fc9" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="30dd-0543-289b-4031" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -2650,7 +2644,6 @@
         <categoryLink id="60ed-b380-54c4-4a9d" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="c2af-4376-1f3e-103d" name="New CategoryLink" hidden="false" targetId="93aa-d8fa-b826-9fbc" primary="false"/>
         <categoryLink id="16dc-da21-2307-4a19" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
-        <categoryLink id="a87a-a3a1-618e-703f" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="3978-8bfa-5083-b7ce" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -2962,7 +2955,6 @@
         <categoryLink id="ec9f-6d42-418e-787e" name="New CategoryLink" hidden="false" targetId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" primary="false"/>
         <categoryLink id="53f0-f56a-c98a-f44c" name="Faction: &lt;Kabal&gt;" hidden="false" targetId="105d-2b08-1dc3-2f69" primary="false"/>
         <categoryLink id="02ac-b82c-7545-15ef" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
-        <categoryLink id="e9d9-9b8f-fe0c-48c4" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="cef0-9503-cb74-7b37" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntries>
@@ -3030,7 +3022,6 @@
         <categoryLink id="6038-b4f2-870e-c981" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="dfb9-c29a-74d8-2192" name="New CategoryLink" hidden="false" targetId="8c44-0452-c143-f9b0" primary="false"/>
         <categoryLink id="bda8-f180-08dd-23d9" name="Faction: &lt;Kabal&gt;" hidden="false" targetId="105d-2b08-1dc3-2f69" primary="false"/>
-        <categoryLink id="78b5-c7b6-4d82-3130" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="b7ee-a4ad-1e94-1acd" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntries>
@@ -3103,7 +3094,6 @@
         <categoryLink id="be2e-a090-3fcf-5c3c" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="2111-7302-d754-9fa6" name="New CategoryLink" hidden="false" targetId="c9a9-0a9a-8be9-1474" primary="false"/>
         <categoryLink id="e5a2-304a-21ec-f4ce" name="Faction: &lt;Kabal&gt;" hidden="false" targetId="105d-2b08-1dc3-2f69" primary="false"/>
-        <categoryLink id="0537-11b7-3339-4ab4" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="fe7e-644a-9426-1510" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntries>
@@ -3171,7 +3161,6 @@
         <categoryLink id="58ce-ad76-8160-66dc" name="Beast" hidden="false" targetId="3ffd-1622-9bf7-70ba" primary="false"/>
         <categoryLink id="cc04-ccae-0d81-e25f" name="Swarm" hidden="false" targetId="7a53-eedc-8dbb-8505" primary="false"/>
         <categoryLink id="7ce2-a41f-dc19-0a6d" name="New CategoryLink" hidden="false" targetId="c274d0b0-5866-44bc-9810-91c136ae7438" primary="true"/>
-        <categoryLink id="5554-6194-44d4-bada" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="eb12-2d06-4bbb-ece1" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -3271,7 +3260,6 @@
         <categoryLink id="f4f4-77d8-96ff-4d61" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="0ca1-fd4d-37bf-dd9d" name="New CategoryLink" hidden="false" targetId="1579-ae66-e2f8-cb10" primary="false"/>
         <categoryLink id="05e5-b494-0016-d607" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
-        <categoryLink id="3a53-a165-15cc-23fd" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="17e8-26ec-b7e9-45e9" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -3532,7 +3520,6 @@
         <categoryLink id="3088-45fe-86f2-cc02" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="9996-d603-331c-ee90" name="New CategoryLink" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
         <categoryLink id="68b6-2120-5e1a-01cf" name="Skyboard" hidden="false" targetId="af4a-549d-3c09-4e6f" primary="false"/>
-        <categoryLink id="6e96-0301-95de-54a5" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="9e6e-4fb8-b26b-13e6" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="cbac-3289-3fae-bc8c" name="Beastmaster" hidden="false" targetId="9c70-9a0a-6131-0324" primary="false"/>
       </categoryLinks>
@@ -3619,7 +3606,6 @@
         <categoryLink id="0fb3-8da7-c448-116f" name="Drukhari Beast" hidden="false" targetId="3ffd-1622-9bf7-70ba" primary="false"/>
         <categoryLink id="212f-a970-c39a-6a11" name="New CategoryLink" hidden="false" targetId="c274d0b0-5866-44bc-9810-91c136ae7438" primary="true"/>
         <categoryLink id="0871-8492-e579-4edc" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
-        <categoryLink id="d7a9-234b-3502-d0a9" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="53c2-b7b3-f0df-6914" name="1-6 Clawed fiends" hidden="false" collective="false" import="true" defaultSelectionEntryId="7c2f-ef98-6c9d-a2aa">
@@ -3800,7 +3786,6 @@
         <categoryLink id="1141-9f39-81b6-9470" name="New CategoryLink" hidden="false" targetId="5d76b6f5-20ae-4d70-8f59-ade72a2add3a" primary="true"/>
         <categoryLink id="1e3b-2cee-edf9-d499" name="Wyches" hidden="false" targetId="5b68-0855-2fb2-1f69" primary="false"/>
         <categoryLink id="1782-ec9b-ef3f-d0dd" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
-        <categoryLink id="216b-1fbb-9c36-f2b5" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="ebc9-12b5-fb5b-9991" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -4061,7 +4046,6 @@
         <categoryLink id="27d0-35bd-097d-95c0" name="New CategoryLink" hidden="false" targetId="98b7-d351-e823-fc09" primary="false"/>
         <categoryLink id="b8b3-b76e-11fc-a8e2" name="New CategoryLink" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
         <categoryLink id="44c6-bd69-9eff-c104" name="Monster" hidden="false" targetId="3b77-decb-d468-6bcc" primary="false"/>
-        <categoryLink id="47ea-bfcf-391c-3bd7" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="8011-a847-c35a-d609" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -4193,7 +4177,6 @@
         <categoryLink id="a8f0-fc0f-d95c-849c" name="New CategoryLink" hidden="false" targetId="2081-49f0-1e15-a9f3" primary="false"/>
         <categoryLink id="7cf8-36da-545a-b602" name="Infantry" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="e420-4dfe-d059-cdcc" name="Blades For Hire" hidden="false" targetId="f2b5-6509-4476-4fa2" primary="false"/>
-        <categoryLink id="7929-50ac-344d-6f48" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="5ecb-74ec-29e1-c41d" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntries>
@@ -4326,7 +4309,6 @@
         <categoryLink id="5c4d-7181-ce72-8c41" name="New CategoryLink" hidden="false" targetId="b15b-abaf-9eda-f855" primary="false"/>
         <categoryLink id="e7cf-6ecf-3d38-070b" name="Skyboard" hidden="false" targetId="af4a-549d-3c09-4e6f" primary="false"/>
         <categoryLink id="1ccf-56cb-2076-994c" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
-        <categoryLink id="15b4-b7a4-c411-8c04" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="d2ea-7f2b-7a04-d908" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -4554,6 +4536,21 @@
             <condition field="selections" scope="0a1e-abbc-c986-0b6c" value="5.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4962-0228-8ffe-026c" type="greaterThan"/>
           </conditions>
         </modifier>
+        <modifier type="increment" field="e356-c769-5920-6e14" value="1.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+          </conditions>
+        </modifier>
+        <modifier type="increment" field="e356-c769-5920-6e14" value="1.0">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition field="selections" scope="parent" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" type="greaterThan"/>
+                <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
       <infoLinks>
         <infoLink id="2b78-1f4d-0b90-65b5" name="Power from Pain" hidden="false" targetId="e6c3-8502-de0a-9515" type="rule"/>
@@ -4567,7 +4564,6 @@
         <categoryLink id="0c98-4381-e365-486f" name="New CategoryLink" hidden="false" targetId="2081-49f0-1e15-a9f3" primary="false"/>
         <categoryLink id="5359-058a-d9b7-d57a" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
         <categoryLink id="de4a-9b5a-88f3-9259" name="Blades For Hire" hidden="false" targetId="f2b5-6509-4476-4fa2" primary="false"/>
-        <categoryLink id="1974-d6fa-8280-c756" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="4405-dd26-ad73-e71f" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -4578,6 +4574,13 @@
           </constraints>
           <selectionEntries>
             <selectionEntry id="8faf-da84-e623-f0b8" name="Incubi" page="0" hidden="false" collective="false" import="true" type="model">
+              <modifiers>
+                <modifier type="increment" field="points" value="4.0">
+                  <conditions>
+                    <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bd61-d6b6-90c8-49e5" type="min"/>
                 <constraint field="selections" scope="parent" value="9.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ed44-2381-fb58-e2dc" type="max"/>
@@ -4620,6 +4623,13 @@
               </costs>
             </selectionEntry>
             <selectionEntry id="1470-ac5f-4dd9-c5d4" name="Klaivex" page="0" hidden="false" collective="false" import="true" type="upgrade">
+              <modifiers>
+                <modifier type="increment" field="points" value="4.0">
+                  <conditions>
+                    <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e523-0cc3-c159-9edf" type="max"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4451-571e-9ffc-bbe6" type="min"/>
@@ -4724,7 +4734,6 @@
         <categoryLink id="f776-3da0-346c-72cb" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
         <categoryLink id="5505-e161-d5fc-949c" name="Kabalite Warriors" hidden="false" targetId="a6a2-680c-c64c-587a" primary="false"/>
         <categoryLink id="e63c-1332-fe7e-e4d0" name="Infantry" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
-        <categoryLink id="4630-3fd6-6c55-66c8" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="2367-f564-4dbf-df80" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -4995,7 +5004,6 @@
         <categoryLink id="e62f-addb-b3f6-5713" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="049e-0f79-79af-2ce5" name="Faction: Wych Cult of Strife" hidden="false" targetId="859a-9acf-049d-dcd9" primary="false"/>
         <categoryLink id="a11a-0d21-1f2b-d638" name="Master Succubus" hidden="false" targetId="3fa5-9569-a481-fdad" primary="false"/>
-        <categoryLink id="0ebb-6956-c14b-cd17" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="4ba2-e7d4-febd-d5aa" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="678e-22fd-4156-bfad" name="Succubus" hidden="false" targetId="ef20-5196-feb6-f23d" primary="false"/>
       </categoryLinks>
@@ -5145,6 +5153,21 @@
             <condition field="selections" scope="ac7a-8b7f-4e94-ac7f" value="5.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="c1e5-da97-07de-50d8" type="greaterThan"/>
           </conditions>
         </modifier>
+        <modifier type="increment" field="e356-c769-5920-6e14" value="1.0">
+          <conditions>
+            <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+          </conditions>
+        </modifier>
+        <modifier type="increment" field="e356-c769-5920-6e14" value="1.0">
+          <conditionGroups>
+            <conditionGroup type="and">
+              <conditions>
+                <condition field="selections" scope="parent" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" type="greaterThan"/>
+                <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
       </modifiers>
       <modifierGroups>
         <modifierGroup>
@@ -5180,7 +5203,6 @@
         <categoryLink id="451d-ea4f-501a-f77c" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
         <categoryLink id="a377-2ce0-0b81-a107" name="Haywire Grenade" hidden="false" targetId="d536-b055-7ef0-4365" primary="false"/>
         <categoryLink id="03de-9649-0e79-aeae" name="Blades For Hire" hidden="false" targetId="f2b5-6509-4476-4fa2" primary="false"/>
-        <categoryLink id="9858-9754-f5ef-3978" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="7389-ce48-eddd-65c1" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -5197,6 +5219,11 @@
                     <repeat field="selections" scope="ac7a-8b7f-4e94-ac7f" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="44f0-cb5e-89c7-47df" repeats="1" roundUp="false"/>
                   </repeats>
                 </modifier>
+                <modifier type="increment" field="points" value="2.0">
+                  <conditions>
+                    <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+                  </conditions>
+                </modifier>
               </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="9.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="97fc-96a5-259b-e565" type="max"/>
@@ -5232,6 +5259,13 @@
               </costs>
             </selectionEntry>
             <selectionEntry id="9490-f87b-710e-ea99" name="Solarite" hidden="false" collective="false" import="true" type="model">
+              <modifiers>
+                <modifier type="increment" field="points" value="2.0">
+                  <conditions>
+                    <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b508-13d8-c1c1-054f" type="max"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e5de-5462-54de-df0e" type="min"/>
@@ -5307,7 +5341,7 @@
                 </selectionEntryGroup>
               </selectionEntryGroups>
               <entryLinks>
-                <entryLink id="f93f-ed8b-9254-fefd" name="Plasma grenades" hidden="false" collective="false" import="true" targetId="074b-ec02-d530-8616" type="selectionEntry"/>
+                <entryLink id="f93f-ed8b-9254-fefd" name="Plasma Grenades" hidden="false" collective="false" import="true" targetId="074b-ec02-d530-8616" type="selectionEntry"/>
               </entryLinks>
               <costs>
                 <cost name="pts" typeId="points" value="12.0"/>
@@ -5316,6 +5350,13 @@
               </costs>
             </selectionEntry>
             <selectionEntry id="44f0-cb5e-89c7-47df" name="Scourge with Special / Heavy weapon" hidden="false" collective="false" import="true" type="model">
+              <modifiers>
+                <modifier type="increment" field="points" value="2.0">
+                  <conditions>
+                    <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ef2-1d78-ae54-dff8" type="max"/>
               </constraints>
@@ -5432,7 +5473,6 @@
         <categoryLink id="c3d6-2473-875e-3213" name="New CategoryLink" hidden="false" targetId="3b77-decb-d468-6bcc" primary="false"/>
         <categoryLink id="82bd-4ec2-18a2-e048" name="New CategoryLink" hidden="false" targetId="d1dc-6993-2368-3809" primary="false"/>
         <categoryLink id="8940-459d-a97b-f05d" name="New CategoryLink" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
-        <categoryLink id="ef02-d4ce-54ba-63cd" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="b6b7-d89b-d27c-a835" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -5736,7 +5776,6 @@
         <categoryLink id="e3df-5020-86bf-822f" name="New CategoryLink" hidden="false" targetId="be89-e5a2-cf0e-c91c" primary="false"/>
         <categoryLink id="5830-329f-cb78-1800" name="Faction: Prophets of Flesh" hidden="false" targetId="43ef-6837-7167-e8ec" primary="false"/>
         <categoryLink id="de3c-771e-abc5-56e8" name="Master Haemonculus" hidden="false" targetId="19a9-184d-4492-40ce" primary="false"/>
-        <categoryLink id="3e3b-4a10-9001-c893" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="8c7a-699f-536a-dac7" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="7306-c669-4aac-3561" name="Haemonculus" hidden="false" targetId="65d3-140a-2185-ef41" primary="false"/>
       </categoryLinks>
@@ -5871,7 +5910,6 @@
       <categoryLinks>
         <categoryLink id="1865-cfab-994a-4f51" name="New CategoryLink" hidden="false" targetId="e888-1504-aa61-95ff" primary="true"/>
         <categoryLink id="166d-62bf-5544-e4fc" name="Aircraft" hidden="false" targetId="d569-3d56-cd24-6a31" primary="false"/>
-        <categoryLink id="9f69-fbab-832c-c815" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="4297-4a96-8e9b-944f" name="Fly" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
         <categoryLink id="8b10-ed4f-d61e-3172" name="Vehicle" hidden="false" targetId="c8fd-783f-3230-493e" primary="false"/>
         <categoryLink id="78c4-4621-241a-06cd" name="Voidraven Bomber" hidden="false" targetId="a028-67e7-ffca-214b" primary="false"/>
@@ -6074,7 +6112,6 @@
         <categoryLink id="d6f6-a2df-9c1b-96b1" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="5632-97a1-e6ac-379f" name="New CategoryLink" hidden="false" targetId="5b68-0855-2fb2-1f69" primary="false"/>
         <categoryLink id="a74c-5c4f-4a51-1a4f" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
-        <categoryLink id="84b3-716f-5b33-3b6a" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="2a4e-46ec-7081-cdb5" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -6475,7 +6512,6 @@
       <categoryLinks>
         <categoryLink id="8ed3-6d55-c641-6912" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="0406-8d6e-a9b0-ab89" name="New CategoryLink" hidden="false" targetId="c562-0478-2bfa-f12c" primary="false"/>
-        <categoryLink id="ced2-dbbd-6d55-c98c" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="3580-f46f-db90-3fa4" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntries>
@@ -6623,7 +6659,6 @@
         <categoryLink id="1a1b-f719-7dc9-c65c" name="Drukhari Beast" hidden="false" targetId="3ffd-1622-9bf7-70ba" primary="false"/>
         <categoryLink id="8c2d-2670-0e03-21fe" name="Daemon" hidden="false" targetId="94b1-311f-cf71-99dd" primary="false"/>
         <categoryLink id="43b4-1039-a404-9bf5" name="New CategoryLink" hidden="false" targetId="c274d0b0-5866-44bc-9810-91c136ae7438" primary="true"/>
-        <categoryLink id="8792-0aa2-c188-23ec" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="0e5f-1a85-d4fd-a7eb" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
@@ -6743,7 +6778,6 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5d5f-96cb-76b1-23f6" name="New CategoryLink" hidden="false" targetId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" primary="true"/>
-        <categoryLink id="2042-2086-112b-f1fd" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="3485-b668-4aea-58de" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="802e-289e-6784-7445" name="Faction: &lt;Kabal&gt;" hidden="false" targetId="105d-2b08-1dc3-2f69" primary="false"/>
         <categoryLink id="3440-a190-c8ec-42b1" name="Infantry" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
@@ -6869,7 +6903,6 @@
         <categoryLink id="83f9-81fe-3940-48c4" name="New CategoryLink" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
         <categoryLink id="433c-212d-9692-90ba" name="New CategoryLink" hidden="false" targetId="8447-1ad0-d85e-4d5a" primary="false"/>
         <categoryLink id="b2d1-e33e-ffd0-9305" name="New CategoryLink" hidden="false" targetId="abf5fd55-9ac7-4263-8bc1-a9fb0a8fa6a6" primary="true"/>
-        <categoryLink id="7c23-aa3b-cf84-90e8" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="7b2f-0693-8123-a0f9" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntries>
@@ -7028,7 +7061,6 @@
         <categoryLink id="2d61-6d85-0fd8-416f" name="New CategoryLink" hidden="false" targetId="6cc4-1b62-8e8a-05cd" primary="false"/>
         <categoryLink id="21df-7f94-3606-5966" name="New CategoryLink" hidden="false" targetId="c8fd-783f-3230-493e" primary="false"/>
         <categoryLink id="79e2-2fac-f420-93af" name="New CategoryLink" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
-        <categoryLink id="0b2f-1423-c108-5f9e" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="3ece-a61f-9194-99cf" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
       </categoryLinks>
       <selectionEntries>
@@ -7094,6 +7126,13 @@
       </costs>
     </selectionEntry>
     <selectionEntry id="3663-e78f-7417-5296" name="Obsession" hidden="false" collective="false" import="true" type="upgrade">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditions>
+            <condition field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="5af8-e7c8-e3bf-6d52" type="greaterThan"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
         <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b3d5-201d-8078-7600" type="max"/>
         <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7674-2581-161a-8aff" type="min"/>
@@ -7668,7 +7707,6 @@
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9db1-5f18-cec3-768a" name="New CategoryLink" hidden="false" targetId="e888-1504-aa61-95ff" primary="true"/>
-        <categoryLink id="44e5-8aa2-5886-c8a4" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="0847-554d-14cb-ad59" name="Vehicle" hidden="false" targetId="c8fd-783f-3230-493e" primary="false"/>
         <categoryLink id="32fc-6dbc-f9ee-e8cf" name="Fly" hidden="false" targetId="3117-16d8-fcef-4f56" primary="false"/>
         <categoryLink id="ca9a-d101-41d0-0a27" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
@@ -7767,7 +7805,6 @@ Once per phase, the first time a saving throw is failed for this unit, the damag
         <categoryLink id="4f85-57a1-7249-d54c" name="New CategoryLink" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
         <categoryLink id="a9bd-1f7e-3be1-5759" name="New CategoryLink" hidden="false" targetId="93aa-d8fa-b826-9fbc" primary="false"/>
         <categoryLink id="b195-05aa-f057-8e02" name="Haemoxytes" hidden="false" targetId="5bc6-8843-9000-8c57" primary="false"/>
-        <categoryLink id="6d31-4371-d407-a3a3" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="e35a-370a-5f6a-5638" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="30ad-25e3-ed7b-b5bf" name="Core" hidden="false" targetId="08f1-d244-eb44-7e01" primary="false"/>
       </categoryLinks>
@@ -8434,7 +8471,6 @@ In a Battle-forged army in a matched play game, you can only include &lt;KABAL&g
       <categoryLinks>
         <categoryLink id="b0ca-b29c-8254-aa1d" name="Ur-Ghul" hidden="false" targetId="c562-0478-2bfa-f12c" primary="false"/>
         <categoryLink id="7130-d651-1c03-8a18" name="New CategoryLink" hidden="false" targetId="ff36a6f3-19bf-4f48-8956-adacfd28fe74" primary="true"/>
-        <categoryLink id="37da-efdd-6202-a6b8" name="Faction: Aeldari" hidden="false" targetId="dbb4-dfd1-04b9-5980" primary="false"/>
         <categoryLink id="9e58-0355-62b9-6a59" name="Faction: Drukhari" hidden="false" targetId="955e-536a-e290-5dcf" primary="false"/>
         <categoryLink id="fd3f-2dfa-7510-d383" name="Faction: &lt;Kabal&gt;" hidden="false" targetId="105d-2b08-1dc3-2f69" primary="false"/>
         <categoryLink id="bc14-5464-a661-ed70" name="Infantry" hidden="false" targetId="3d52-fccf-10c0-3fae" primary="false"/>
diff --git a/Aeldari - Harlequins.cat b/Aeldari - Harlequins.cat
index 6cdfa01d25..d00f41f028 100644
--- a/Aeldari - Harlequins.cat	
+++ b/Aeldari - Harlequins.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7d24-b92f-c5d5-3bf0" name="Aeldari - Harlequins" revision="67" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@WindstormSCR @FarseerV" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="208" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="7d24-b92f-c5d5-3bf0" name="Aeldari - Harlequins" revision="68" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@WindstormSCR @FarseerV" authorUrl="https://www.bsdata.net/contact" library="false" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="208" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <publications>
     <publication id="7d24-b92f-pubN65537" name="Codex: Harlequins"/>
   </publications>
@@ -1095,7 +1095,7 @@
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5af8-e7c8-e3bf-6d52" type="atLeast"/>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5af8-e7c8-e3bf-6d52" type="atLeast"/>
           </conditions>
         </modifier>
         <modifier type="add" field="category" value="93a5-5452-136c-f12e">
@@ -1643,6 +1643,13 @@
       </costs>
     </selectionEntry>
     <selectionEntry id="1b5c-b38b-24a2-63d9" name="Saedath Characterisation" hidden="false" collective="false" import="true" type="upgrade">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5af8-e7c8-e3bf-6d52" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
         <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c021-4afe-3ec0-cff6" type="max"/>
         <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d3fb-09af-3e9d-ce22" type="min"/>
@@ -2262,6 +2269,13 @@ Each time the bearer sucessfully manifests a psychic power from the PHantasmacy
       </entryLinks>
     </selectionEntryGroup>
     <selectionEntryGroup id="5f1d-616d-887e-84c4" name="Pivotal Roles - Shadowseer" hidden="false" collective="false" import="true">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5af8-e7c8-e3bf-6d52" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="34fa-bbe4-2543-f793" type="max"/>
       </constraints>
@@ -2323,6 +2337,13 @@ Each time the bearer sucessfully manifests a psychic power from the PHantasmacy
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="ce4f-8e83-f6ba-94b7" name="Pivotal Roles - Troupe Master" hidden="false" collective="false" import="true">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5af8-e7c8-e3bf-6d52" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2837-2bac-1fe2-5b6a" type="max"/>
       </constraints>
@@ -2449,6 +2470,13 @@ That attack&apos;s hit roll cannot be re-rolled.</characteristic>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="2963-6e2a-c6e3-e38a" name="Pivotal Roles - Death Jester" hidden="false" collective="false" import="true">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditions>
+            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="5af8-e7c8-e3bf-6d52" type="atLeast"/>
+          </conditions>
+        </modifier>
+      </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8655-a4ab-1717-9d6a" type="max"/>
       </constraints>
diff --git a/Aeldari - Ynnari.cat b/Aeldari - Ynnari.cat
index 450bed845b..c0c664866a 100644
--- a/Aeldari - Ynnari.cat	
+++ b/Aeldari - Ynnari.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="2f0e-dd91-7676-722d" name="Aeldari - Ynnari" revision="102" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@FarseerV" authorUrl="https://www.bsdata.net/contact" library="true" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="208" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="2f0e-dd91-7676-722d" name="Aeldari - Ynnari" revision="103" battleScribeVersion="2.03" authorName="BSData Developers" authorContact="@FarseerV" authorUrl="https://www.bsdata.net/contact" library="true" gameSystemId="28ec-711c-d87f-3aeb" gameSystemRevision="208" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>This library will now be an Aeldari library - all shared pointy ear stuff now lives here</comment>
   <readme>This library will now be an Aeldari library - all shared pointy ear stuff now lives here</readme>
   <publications>
@@ -148,7 +148,7 @@
       <modifiers>
         <modifier type="add" field="category" value="858e-1bd9-61c9-6dcf">
           <conditions>
-            <condition field="selections" scope="1409-e740-c7c9-3758" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" childId="2ce0-03a1-ec03-76aa" type="greaterThan"/>
+            <condition field="selections" scope="1409-e740-c7c9-3758" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2ce0-03a1-ec03-76aa" type="greaterThan"/>
           </conditions>
         </modifier>
       </modifiers>
@@ -195,8 +195,8 @@
       </profiles>
       <infoLinks>
         <infoLink id="7b93-1518-9dcf-95be" name="Smite" hidden="false" targetId="5821-6c45-8572-7e0e" type="profile"/>
-        <infoLink id="0d52-b1c7-33f6-fad5" name="Strands of Fate" hidden="false" targetId="f5cf-ac08-7c58-c76d" type="rule"/>
         <infoLink id="4c51-b838-a490-0585" name="Battle Focus" hidden="false" targetId="d861-e9f8-5a9c-7595" type="rule"/>
+        <infoLink id="54c4-948b-9d28-bd23" name="Strands of Fate" hidden="false" targetId="f5cf-ac08-7c58-c76d" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="c9d5-81eb-d052-bb5b" name="New CategoryLink" hidden="false" targetId="ef18-746a-369f-43a4" primary="false"/>
@@ -269,13 +269,6 @@
       </costs>
     </selectionEntry>
     <selectionEntry id="c0ea-f722-6a2e-6d65" name="The Yncarne" publicationId="1f62-db93-63f4-4dc7" page="189" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="add" field="category" value="858e-1bd9-61c9-6dcf">
-          <conditions>
-            <condition field="selections" scope="c0ea-f722-6a2e-6d65" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" childId="2ce0-03a1-ec03-76aa" type="greaterThan"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7662-9ddb-0b04-fe01" type="max"/>
       </constraints>
@@ -434,6 +427,13 @@
       </selectionEntries>
       <entryLinks>
         <entryLink id="5573-2e03-dd89-0c87" name="Warlord" hidden="false" collective="false" import="true" targetId="2ce0-03a1-ec03-76aa" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="858e-1bd9-61c9-6dcf">
+              <conditions>
+                <condition field="selections" scope="c0ea-f722-6a2e-6d65" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2ce0-03a1-ec03-76aa" type="greaterThan"/>
+              </conditions>
+            </modifier>
+          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a242-4dc5-3e06-3742" type="max"/>
           </constraints>
@@ -476,13 +476,6 @@
       </costs>
     </selectionEntry>
     <selectionEntry id="6c95-9f0a-0951-30ab" name="The Visarch" publicationId="1f62-db93-63f4-4dc7" page="188" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="add" field="category" value="858e-1bd9-61c9-6dcf">
-          <conditions>
-            <condition field="selections" scope="6c95-9f0a-0951-30ab" value="0.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" childId="2ce0-03a1-ec03-76aa" type="greaterThan"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="df9b-4713-c4b2-7daa" type="max"/>
       </constraints>
@@ -573,6 +566,13 @@
       </selectionEntries>
       <entryLinks>
         <entryLink id="2248-3aec-27f8-6a74" name="Warlord" hidden="false" collective="false" import="true" targetId="2ce0-03a1-ec03-76aa" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="858e-1bd9-61c9-6dcf">
+              <conditions>
+                <condition field="selections" scope="6c95-9f0a-0951-30ab" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="2ce0-03a1-ec03-76aa" type="greaterThan"/>
+              </conditions>
+            </modifier>
+          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="739a-7104-5199-9de0" type="max"/>
           </constraints>
@@ -3136,7 +3136,7 @@ Unless the only units with this attribute are part of an Auxiliary Support, Supe
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="5af8-e7c8-e3bf-6d52" name="Ynnari" publicationId="1f62-db93-63f4-4dc7" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="5af8-e7c8-e3bf-6d52" name="Ynnari: Strength From Death" publicationId="1f62-db93-63f4-4dc7" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="79d2-d930-98d5-f709" type="max"/>
           </constraints>
@@ -3161,6 +3161,11 @@ Each time an attack is made by a model with this attibute, if that model&apos;s
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e3f2-9054-1ea8-349a" type="max"/>
           </constraints>
+          <costs>
+            <cost name=" PL" typeId="e356-c769-5920-6e14" value="0.0"/>
+            <cost name="CP" typeId="2d3b-b544-ad49-fb75" value="0.0"/>
+            <cost name="pts" typeId="points" value="0.0"/>
+          </costs>
         </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>