diff --git a/2021 - Nemesis Claw.cat b/2021 - Nemesis Claw.cat
index 1282639..0104aba 100644
--- a/2021 - Nemesis Claw.cat	
+++ b/2021 - Nemesis Claw.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue library="false" id="1875-7d67-8936-96d2" name="Nemesis Claw" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="8" revision="1" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue library="false" id="1875-7d67-8936-96d2" name="Nemesis Claw" gameSystemId="3b7e-7dab-f79f-2e74" gameSystemRevision="8" revision="2" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry name="NEMESIS CLAW" id="4291-e80d-fafa-9c16" hidden="false"/>
     <categoryEntry name="Visionary" id="9ed4-6fff-d60e-85a7" hidden="false"/>
@@ -213,56 +213,6 @@
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="8577-422f-daf8-4b6a-max"/>
           </constraints>
         </selectionEntryGroup>
-        <selectionEntryGroup name="Equipment" id="7383-8799-af8a-805" hidden="false">
-          <constraints>
-            <constraint type="max" value="10" field="c61a-51a3-370d-bf55" scope="force" shared="true" id="32c-ced8-9196-239d" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-          </constraints>
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="notInstanceOf" value="6" field="selections" scope="force" childId="48c8-e9ec-fa2a-1774" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <entryLinks>
-            <entryLink import="true" name="Melee Weapons Rare Equipment" hidden="false" id="4ce1-bb53-1739-1cb4" collective="false" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
-            <entryLink import="true" name="Ranged Weapons Rare Equipment" hidden="false" id="93dc-2b5a-ed99-5727" collective="false" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup name="Specialism" id="abc4-e115-9c51-dd19" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="lessThan" value="6" field="selections" scope="parent" childId="82af-b9b8-518f-aaf1" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="123d-2e56-d1f8-cd09" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </constraints>
-          <entryLinks>
-            <entryLink import="true" name="Staunch" hidden="false" id="97df-e0d3-c440-da84" collective="false" targetId="eb50-055a-4cd2-e1d5" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Marksman" hidden="false" id="d0c7-20e5-41a4-4379" collective="false" targetId="715c-810e-df05-01ad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Combat" hidden="false" id="d70d-dbf9-5529-930b" collective="false" targetId="97d8-19ec-143d-8aad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Scout" hidden="false" id="6c6a-e933-db01-b92a" collective="false" targetId="9118-a98b-0ffe-9e3d" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
         <entryLink import="true" name="Battle Honours - Combat" hidden="false" id="7d3b-35f1-6c52-c470" type="selectionEntryGroup" targetId="ae2f-d9f3-a27c-cca6">
@@ -305,6 +255,8 @@
             <entryLink import="true" name="Nemesis Claw 6 - Malicious Fighter" hidden="false" id="c2f-f095-4f3d-75d7" type="selectionEntry" targetId="9e26-a3b1-80b0-62b0"/>
           </entryLinks>
         </entryLink>
+        <entryLink import="true" name="Equipment" hidden="false" id="d6de-ec7c-17ea-e2ad" type="selectionEntryGroup" targetId="3122-97eb-d8b4-feaf"/>
+        <entryLink import="true" name="Specialism" hidden="false" id="f7a-5ede-e922-50b9" type="selectionEntryGroup" targetId="aa7-992f-3e23-c55"/>
       </entryLinks>
     </selectionEntry>
     <selectionEntry type="model" import="true" name="Night Lord Fearmonger" hidden="false" id="edc-9563-13a3-cf99">
@@ -316,58 +268,6 @@
         <categoryLink targetId="35e3-b57c-1f4e-69e1" id="3d55-22f9-2f4-bc50" primary="false" name="Fearmonger"/>
         <categoryLink targetId="4291-e80d-fafa-9c16" id="52aa-d272-7d1a-5e3f" primary="false" name="NEMESIS CLAW"/>
       </categoryLinks>
-      <selectionEntryGroups>
-        <selectionEntryGroup name="Equipment" id="1174-6ca5-64f1-6a0" hidden="false">
-          <constraints>
-            <constraint type="max" value="10" field="c61a-51a3-370d-bf55" scope="force" shared="true" id="9de6-502b-e356-4fa8" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-          </constraints>
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="notInstanceOf" value="6" field="selections" scope="force" childId="48c8-e9ec-fa2a-1774" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <entryLinks>
-            <entryLink import="true" name="Melee Weapons Rare Equipment" hidden="false" id="9978-2778-c56a-92ae" collective="false" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
-            <entryLink import="true" name="Ranged Weapons Rare Equipment" hidden="false" id="c905-8d28-4652-a8ff" collective="false" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup name="Specialism" id="bb61-da8d-5738-5f67" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="lessThan" value="6" field="selections" scope="parent" childId="82af-b9b8-518f-aaf1" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="9e1-866b-252b-2982" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </constraints>
-          <entryLinks>
-            <entryLink import="true" name="Staunch" hidden="false" id="5940-48dc-4915-c63b" collective="false" targetId="eb50-055a-4cd2-e1d5" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Marksman" hidden="false" id="d3c9-370d-37b5-15e2" collective="false" targetId="715c-810e-df05-01ad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Combat" hidden="false" id="96f8-1e29-ce4e-a1d8" collective="false" targetId="97d8-19ec-143d-8aad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Scout" hidden="false" id="5176-17c5-9585-c0c1" collective="false" targetId="9118-a98b-0ffe-9e3d" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-      </selectionEntryGroups>
       <selectionEntries>
         <selectionEntry type="upgrade" import="true" name="Scoped bolt pistol" hidden="false" id="792d-c3c9-26b7-7fb7">
           <constraints>
@@ -495,6 +395,8 @@
             <entryLink import="true" name="Nemesis Claw 6 - Malicious Fighter" hidden="false" id="3f3d-6036-6429-bb51" type="selectionEntry" targetId="9e26-a3b1-80b0-62b0"/>
           </entryLinks>
         </entryLink>
+        <entryLink import="true" name="Equipment" hidden="false" id="430d-b330-5511-37cf" type="selectionEntryGroup" targetId="3122-97eb-d8b4-feaf"/>
+        <entryLink import="true" name="Specialism" hidden="false" id="1dda-13dc-8c80-ca45" type="selectionEntryGroup" targetId="aa7-992f-3e23-c55"/>
       </entryLinks>
     </selectionEntry>
     <selectionEntry type="model" import="true" name="Night Lord Gunner" hidden="false" id="5bf1-f4e0-cbc2-7bca">
@@ -554,56 +456,6 @@
             <entryLink import="true" name="Flamer" hidden="false" id="c1c5-b425-2887-313e" type="selectionEntry" targetId="f18c-06a7-747c-90c0"/>
           </entryLinks>
         </selectionEntryGroup>
-        <selectionEntryGroup name="Equipment" id="74f4-b321-63a2-9c25" hidden="false">
-          <constraints>
-            <constraint type="max" value="10" field="c61a-51a3-370d-bf55" scope="force" shared="true" id="e9ae-c2e9-3dc1-f250" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-          </constraints>
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="notInstanceOf" value="6" field="selections" scope="force" childId="48c8-e9ec-fa2a-1774" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <entryLinks>
-            <entryLink import="true" name="Melee Weapons Rare Equipment" hidden="false" id="d7f0-c07a-d48f-2bcc" collective="false" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
-            <entryLink import="true" name="Ranged Weapons Rare Equipment" hidden="false" id="7bb9-7c46-89bd-b8e6" collective="false" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup name="Specialism" id="3290-22d7-5e64-3e1e" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="lessThan" value="6" field="selections" scope="parent" childId="82af-b9b8-518f-aaf1" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="374f-4728-e9d-6beb" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </constraints>
-          <entryLinks>
-            <entryLink import="true" name="Staunch" hidden="false" id="ec11-8f75-80b-7c32" collective="false" targetId="eb50-055a-4cd2-e1d5" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Marksman" hidden="false" id="abf-27dc-7664-76e9" collective="false" targetId="715c-810e-df05-01ad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Combat" hidden="false" id="63f6-c863-e0f2-6ecb" collective="false" targetId="97d8-19ec-143d-8aad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Scout" hidden="false" id="3d7-b2d0-b4a2-7d82" collective="false" targetId="9118-a98b-0ffe-9e3d" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
         <entryLink import="true" name="Fists" hidden="false" id="7236-81e0-3b7f-d674" type="selectionEntry" targetId="e03f-501c-e989-74a1">
@@ -632,6 +484,8 @@
             <entryLink import="true" name="Nemesis Claw 6 - Malicious Fighter" hidden="false" id="618e-789d-fcb9-9a2d" type="selectionEntry" targetId="9e26-a3b1-80b0-62b0"/>
           </entryLinks>
         </entryLink>
+        <entryLink import="true" name="Equipment" hidden="false" id="5aed-2ed5-9a16-d1c3" type="selectionEntryGroup" targetId="3122-97eb-d8b4-feaf"/>
+        <entryLink import="true" name="Specialism" hidden="false" id="a021-5c6b-2099-f38a" type="selectionEntryGroup" targetId="aa7-992f-3e23-c55"/>
       </entryLinks>
       <categoryLinks>
         <categoryLink targetId="ba61-d304-9352-ec15" id="d76a-7209-f2bd-8b48" primary="false" name="Chaos"/>
@@ -708,56 +562,6 @@
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="88ef-a614-3964-b59b-max"/>
           </constraints>
         </selectionEntryGroup>
-        <selectionEntryGroup name="Equipment" id="ad9b-d0d9-3d84-f78f" hidden="false">
-          <constraints>
-            <constraint type="max" value="10" field="c61a-51a3-370d-bf55" scope="force" shared="true" id="bf69-a8e0-ab5d-a90c" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-          </constraints>
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="notInstanceOf" value="6" field="selections" scope="force" childId="48c8-e9ec-fa2a-1774" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <entryLinks>
-            <entryLink import="true" name="Melee Weapons Rare Equipment" hidden="false" id="73a0-5795-c8c1-a69" collective="false" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
-            <entryLink import="true" name="Ranged Weapons Rare Equipment" hidden="false" id="1ac6-ab36-978b-9913" collective="false" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup name="Specialism" id="aaca-7fa1-86b7-e11a" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="lessThan" value="6" field="selections" scope="parent" childId="82af-b9b8-518f-aaf1" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="6f65-488b-c1de-170a" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </constraints>
-          <entryLinks>
-            <entryLink import="true" name="Staunch" hidden="false" id="c6b0-e19-4cf0-1ee5" collective="false" targetId="eb50-055a-4cd2-e1d5" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Marksman" hidden="false" id="a0a3-36a5-9bae-2370" collective="false" targetId="715c-810e-df05-01ad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Combat" hidden="false" id="9e88-3409-3087-e79d" collective="false" targetId="97d8-19ec-143d-8aad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Scout" hidden="false" id="a6f1-cd53-285f-edf2" collective="false" targetId="9118-a98b-0ffe-9e3d" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
         <entryLink import="true" name="Fists" hidden="false" id="d2e4-c6fb-34d3-8b7a" type="selectionEntry" targetId="e03f-501c-e989-74a1">
@@ -786,6 +590,8 @@
             <entryLink import="true" name="Nemesis Claw 6 - Malicious Fighter" hidden="false" id="ac3c-26b9-6579-f8a6" type="selectionEntry" targetId="9e26-a3b1-80b0-62b0"/>
           </entryLinks>
         </entryLink>
+        <entryLink import="true" name="Equipment" hidden="false" id="7637-cfea-3c79-707e" type="selectionEntryGroup" targetId="3122-97eb-d8b4-feaf"/>
+        <entryLink import="true" name="Specialism" hidden="false" id="ccf5-7255-6872-ca94" type="selectionEntryGroup" targetId="aa7-992f-3e23-c55"/>
       </entryLinks>
       <categoryLinks>
         <categoryLink targetId="0e59-07ae-65c2-2de6" id="2386-b3fc-9cae-946f" primary="false" name="Heavy Gunner"/>
@@ -817,58 +623,6 @@
         <categoryLink targetId="ba61-d304-9352-ec15" id="2d00-1427-d89-94ac" primary="false" name="Chaos"/>
         <categoryLink targetId="a336-3c3-9d86-41be" id="326f-e518-6ba6-822a" primary="false" name="Night Lord"/>
       </categoryLinks>
-      <selectionEntryGroups>
-        <selectionEntryGroup name="Equipment" id="79db-5ab2-15e0-af7c" hidden="false">
-          <constraints>
-            <constraint type="max" value="10" field="c61a-51a3-370d-bf55" scope="force" shared="true" id="3954-9c5a-4995-3949" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-          </constraints>
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="notInstanceOf" value="6" field="selections" scope="force" childId="48c8-e9ec-fa2a-1774" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <entryLinks>
-            <entryLink import="true" name="Melee Weapons Rare Equipment" hidden="false" id="4ba9-493b-9b14-3861" collective="false" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
-            <entryLink import="true" name="Ranged Weapons Rare Equipment" hidden="false" id="409-66f8-2ba6-b673" collective="false" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup name="Specialism" id="1de8-7484-5fc2-2c94" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="lessThan" value="6" field="selections" scope="parent" childId="82af-b9b8-518f-aaf1" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="edb5-e143-5a99-c20e" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </constraints>
-          <entryLinks>
-            <entryLink import="true" name="Staunch" hidden="false" id="e532-de0b-3b39-28d2" collective="false" targetId="eb50-055a-4cd2-e1d5" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Marksman" hidden="false" id="bab9-fbc2-2aaa-5886" collective="false" targetId="715c-810e-df05-01ad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Combat" hidden="false" id="55-76aa-6810-3b7b" collective="false" targetId="97d8-19ec-143d-8aad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Scout" hidden="false" id="1097-6cfa-1ec7-de27" collective="false" targetId="9118-a98b-0ffe-9e3d" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-      </selectionEntryGroups>
       <profiles>
         <profile name="Night Lord Screecher" typeId="350c-2ddd-8a24-377b" typeName="Operative" hidden="false" id="67a4-6e58-4f90-4058">
           <characteristics>
@@ -935,6 +689,8 @@
             <entryLink import="true" name="Nemesis Claw 6 - Malicious Fighter" hidden="false" id="d205-fa56-8a3b-77a6" type="selectionEntry" targetId="9e26-a3b1-80b0-62b0"/>
           </entryLinks>
         </entryLink>
+        <entryLink import="true" name="Equipment" hidden="false" id="c05e-def0-5df3-abec" type="selectionEntryGroup" targetId="3122-97eb-d8b4-feaf"/>
+        <entryLink import="true" name="Specialism" hidden="false" id="e916-f7e6-cbc7-183e" type="selectionEntryGroup" targetId="aa7-992f-3e23-c55"/>
       </entryLinks>
     </selectionEntry>
     <selectionEntry type="model" import="true" name="Night Lord Skinthief" hidden="false" id="c7eb-661a-8686-104a">
@@ -946,58 +702,6 @@
         <categoryLink targetId="a336-3c3-9d86-41be" id="63d1-7089-7dad-29a6" primary="false" name="Night Lord"/>
         <categoryLink targetId="ba61-d304-9352-ec15" id="b75b-7764-7a87-c6b0" primary="false" name="Chaos"/>
       </categoryLinks>
-      <selectionEntryGroups>
-        <selectionEntryGroup name="Equipment" id="4fc-b1f7-c4a5-962e" hidden="false">
-          <constraints>
-            <constraint type="max" value="10" field="c61a-51a3-370d-bf55" scope="force" shared="true" id="5f42-9c25-4d97-4c24" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-          </constraints>
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="notInstanceOf" value="6" field="selections" scope="force" childId="48c8-e9ec-fa2a-1774" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <entryLinks>
-            <entryLink import="true" name="Melee Weapons Rare Equipment" hidden="false" id="e8c2-56d0-b512-6565" collective="false" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
-            <entryLink import="true" name="Ranged Weapons Rare Equipment" hidden="false" id="8ae-8141-d45e-4739" collective="false" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup name="Specialism" id="cac0-3725-69ed-3cf8" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="lessThan" value="6" field="selections" scope="parent" childId="82af-b9b8-518f-aaf1" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="b05f-fc12-4eed-7944" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </constraints>
-          <entryLinks>
-            <entryLink import="true" name="Staunch" hidden="false" id="b7ab-e103-2479-535c" collective="false" targetId="eb50-055a-4cd2-e1d5" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Marksman" hidden="false" id="ff92-682d-a615-aebf" collective="false" targetId="715c-810e-df05-01ad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Combat" hidden="false" id="7de3-9c3b-84b4-65a2" collective="false" targetId="97d8-19ec-143d-8aad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Scout" hidden="false" id="6668-fda-5403-962d" collective="false" targetId="9118-a98b-0ffe-9e3d" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-      </selectionEntryGroups>
       <profiles>
         <profile name="Flay Them Alive" hidden="false" id="c2fc-ec2a-77ef-b06c" typeId="f52d-76ec-b279-093b" typeName="Abilities">
           <characteristics>
@@ -1047,6 +751,8 @@
             <entryLink import="true" name="Nemesis Claw 6 - Malicious Fighter" hidden="false" id="84b9-75b6-ac74-eef1" type="selectionEntry" targetId="9e26-a3b1-80b0-62b0"/>
           </entryLinks>
         </entryLink>
+        <entryLink import="true" name="Equipment" hidden="false" id="cb90-7640-6238-5330" type="selectionEntryGroup" targetId="3122-97eb-d8b4-feaf"/>
+        <entryLink import="true" name="Specialism" hidden="false" id="e34-17b2-a879-186d" type="selectionEntryGroup" targetId="aa7-992f-3e23-c55"/>
       </entryLinks>
       <selectionEntries>
         <selectionEntry type="upgrade" import="true" name="Nostraman chainglaive" hidden="false" id="d17b-16f7-437c-5e21">
@@ -1127,56 +833,6 @@
             <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="2f79-a41e-b839-e1ad-max"/>
           </constraints>
         </selectionEntryGroup>
-        <selectionEntryGroup name="Equipment" id="6de9-57af-d141-a39a" hidden="false">
-          <constraints>
-            <constraint type="max" value="10" field="c61a-51a3-370d-bf55" scope="force" shared="true" id="7f47-cc52-4b3d-c245" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-          </constraints>
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="notInstanceOf" value="6" field="selections" scope="force" childId="48c8-e9ec-fa2a-1774" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <entryLinks>
-            <entryLink import="true" name="Melee Weapons Rare Equipment" hidden="false" id="78d2-19b0-e469-d06d" collective="false" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
-            <entryLink import="true" name="Ranged Weapons Rare Equipment" hidden="false" id="e278-df88-8b01-e0a9" collective="false" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup name="Specialism" id="5664-ef4a-265d-ce09" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="lessThan" value="6" field="selections" scope="parent" childId="82af-b9b8-518f-aaf1" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="1e14-5e02-cf99-cea9" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </constraints>
-          <entryLinks>
-            <entryLink import="true" name="Staunch" hidden="false" id="34be-67ae-a82e-6f58" collective="false" targetId="eb50-055a-4cd2-e1d5" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Marksman" hidden="false" id="b7a4-a0fc-7ba8-708d" collective="false" targetId="715c-810e-df05-01ad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Combat" hidden="false" id="2828-f15f-d050-97da" collective="false" targetId="97d8-19ec-143d-8aad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Scout" hidden="false" id="5f64-f0fd-7431-3142" collective="false" targetId="9118-a98b-0ffe-9e3d" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
       </selectionEntryGroups>
       <categoryLinks>
         <categoryLink targetId="ba61-d304-9352-ec15" id="3d35-2bf-6874-7bc1" primary="false" name="Chaos"/>
@@ -1239,6 +895,8 @@
             <entryLink import="true" name="Nemesis Claw 6 - Malicious Fighter" hidden="false" id="3fda-3c64-f9f0-197f" type="selectionEntry" targetId="9e26-a3b1-80b0-62b0"/>
           </entryLinks>
         </entryLink>
+        <entryLink import="true" name="Equipment" hidden="false" id="ec10-70bc-25c3-b866" type="selectionEntryGroup" targetId="3122-97eb-d8b4-feaf"/>
+        <entryLink import="true" name="Specialism" hidden="false" id="472-168b-2841-d79a" type="selectionEntryGroup" targetId="aa7-992f-3e23-c55"/>
       </entryLinks>
     </selectionEntry>
     <selectionEntry type="model" import="true" name="Night Lord Ventrilokar" hidden="false" id="a04c-212f-fc8e-2cc2">
@@ -1251,58 +909,6 @@
         <categoryLink targetId="a336-3c3-9d86-41be" id="f191-aa6a-aa8b-218d" primary="false" name="Night Lord"/>
         <categoryLink targetId="b0a7-aa70-b97c-2b6b" id="85fb-2ec5-3c82-9132" primary="false" name="Ventrilokar"/>
       </categoryLinks>
-      <selectionEntryGroups>
-        <selectionEntryGroup name="Equipment" id="efd7-154a-5cee-4989" hidden="false">
-          <constraints>
-            <constraint type="max" value="10" field="c61a-51a3-370d-bf55" scope="force" shared="true" id="3c2b-bcc2-deba-2057" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-          </constraints>
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="notInstanceOf" value="6" field="selections" scope="force" childId="48c8-e9ec-fa2a-1774" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <entryLinks>
-            <entryLink import="true" name="Melee Weapons Rare Equipment" hidden="false" id="21d5-9987-2b1c-c256" collective="false" targetId="d419-7a47-04c4-e1d9" type="selectionEntryGroup"/>
-            <entryLink import="true" name="Ranged Weapons Rare Equipment" hidden="false" id="ec6b-5e4c-7545-d1b6" collective="false" targetId="aaad-f73a-1e28-248c" type="selectionEntryGroup"/>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup name="Specialism" id="83b-5006-a72b-6a2e" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" value="true" field="hidden">
-              <conditions>
-                <condition type="lessThan" value="6" field="selections" scope="parent" childId="82af-b9b8-518f-aaf1" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
-              </conditions>
-            </modifier>
-          </modifiers>
-          <constraints>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="15e-e355-2812-fff7" percentValue="false" includeChildSelections="false" includeChildForces="false"/>
-          </constraints>
-          <entryLinks>
-            <entryLink import="true" name="Staunch" hidden="false" id="6e12-1268-1cf5-f518" collective="false" targetId="eb50-055a-4cd2-e1d5" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Marksman" hidden="false" id="82b6-d46f-8b16-f7b3" collective="false" targetId="715c-810e-df05-01ad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Combat" hidden="false" id="50a7-840c-128a-9289" collective="false" targetId="97d8-19ec-143d-8aad" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-            <entryLink import="true" name="Scout" hidden="false" id="68a1-774-71ce-fb15" collective="false" targetId="9118-a98b-0ffe-9e3d" type="selectionEntry">
-              <modifiers>
-                <modifier type="set" value="true" field="hidden"/>
-              </modifiers>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-      </selectionEntryGroups>
       <profiles>
         <profile name="Night Lord Ventrilokar" typeId="350c-2ddd-8a24-377b" typeName="Operative" hidden="false" id="75cf-ebcd-a569-d97b">
           <characteristics>
@@ -1363,6 +969,8 @@ This operative cannot perform this action while within Engagement Range of an en
             <entryLink import="true" name="Nemesis Claw 6 - Malicious Fighter" hidden="false" id="6f31-d6d3-a5a2-2dc9" type="selectionEntry" targetId="9e26-a3b1-80b0-62b0"/>
           </entryLinks>
         </entryLink>
+        <entryLink import="true" name="Equipment" hidden="false" id="f9b8-7c82-57ff-6540" type="selectionEntryGroup" targetId="3122-97eb-d8b4-feaf"/>
+        <entryLink import="true" name="Specialism" hidden="false" id="aa54-fef0-f1b5-7e3e" type="selectionEntryGroup" targetId="aa7-992f-3e23-c55"/>
       </entryLinks>
     </selectionEntry>
   </selectionEntries>