diff --git a/Dirandis-v2.cat b/Dirandis-v2.cat
index 16a453f..65d1249 100644
--- a/Dirandis-v2.cat
+++ b/Dirandis-v2.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue library="false" id="8971-e576-a1e6-f7f5" name="Dirandis" gameSystemId="sys-151e-f433-5ee7-6686" gameSystemRevision="1" revision="4" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue library="false" id="8971-e576-a1e6-f7f5" name="Dirandis" gameSystemId="sys-151e-f433-5ee7-6686" gameSystemRevision="1" revision="5" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <catalogueLinks>
     <catalogueLink type="catalogue" name="Banners" id="cc42-fe10-8d98-3386" targetId="e6d3-3757-73e4-6ec4"/>
     <catalogueLink type="catalogue" name="Items" id="43ad-0573-4b51-2b2f" targetId="9fd1-abc6-119d-b5a5"/>
@@ -312,13 +312,17 @@
           </modifiers>
         </infoLink>
       </infoLinks>
-      <modifiers>
-        <modifier type="set-primary" value="e020-218e-a38a-c7c5" field="category">
+      <modifierGroups>
+        <modifierGroup type="and">
           <conditions>
             <condition type="atLeast" value="1" field="selections" scope="roster" childId="2a7f-ca0b-8ef1-b2b5" shared="true" includeChildSelections="true" includeChildForces="true"/>
           </conditions>
-        </modifier>
-      </modifiers>
+          <modifiers>
+            <modifier type="remove" value="9972-b434-5f13-e94b" field="category"/>
+            <modifier type="set-primary" value="e020-218e-a38a-c7c5" field="category"/>
+          </modifiers>
+        </modifierGroup>
+      </modifierGroups>
     </selectionEntry>
   </selectionEntries>
   <entryLinks>
@@ -341,13 +345,17 @@
       <categoryLinks>
         <categoryLink name="Dirandis" hidden="false" id="a677-627e-a243-2159" targetId="7759-6de2-d314-078c" primary="false"/>
       </categoryLinks>
-      <modifiers>
-        <modifier type="set-primary" value="7089-e041-3a8b-00af" field="category">
+      <modifierGroups>
+        <modifierGroup type="and">
           <conditions>
             <condition type="atLeast" value="1" field="selections" scope="roster" childId="2a7f-ca0b-8ef1-b2b5" shared="true" includeChildSelections="true" includeChildForces="true"/>
           </conditions>
-        </modifier>
-      </modifiers>
+          <modifiers>
+            <modifier type="remove" value="e020-218e-a38a-c7c5" field="category"/>
+            <modifier type="set-primary" value="7089-e041-3a8b-00af" field="category"/>
+          </modifiers>
+        </modifierGroup>
+      </modifierGroups>
     </entryLink>
     <entryLink import="true" name="Half-Giants" hidden="false" id="d96e-8086-0f89-608c" type="selectionEntry" targetId="de9f-fbf5-cf27-3781">
       <categoryLinks>
diff --git a/Sheol-morg-v2 Lord Necromancer.cat b/Sheol-morg-v2 Lord Necromancer.cat
index df64f2a..c35d314 100644
--- a/Sheol-morg-v2 Lord Necromancer.cat	
+++ b/Sheol-morg-v2 Lord Necromancer.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue library="false" id="7dd5-8b91-c02b-c423" name="Sheol-morg: Lord Necromancer" gameSystemId="sys-151e-f433-5ee7-6686" gameSystemRevision="1" revision="2" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue library="false" id="7dd5-8b91-c02b-c423" name="Sheol-morg: Lord Necromancer" gameSystemId="sys-151e-f433-5ee7-6686" gameSystemRevision="1" revision="3" battleScribeVersion="2.03" type="catalogue" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <catalogueLinks>
     <catalogueLink type="catalogue" name="Sheol-morg: common" id="cd87-4959-c30c-afdc" targetId="3c37-26cb-3246-fc2d" importRootEntries="true"/>
   </catalogueLinks>
@@ -60,7 +60,11 @@
     <entryLink import="true" name="Truhlaks on Fallen Ogars" hidden="false" id="dd1f-763e-f6a8-e015" type="selectionEntry" targetId="ca96-718c-b8de-69eb">
       <categoryLinks>
         <categoryLink name="Sheol-morg Lord Necromancer" hidden="false" id="718c-f38d-4d54-7558" targetId="34fc-0aaa-8ed7-84c3" primary="false"/>
+        <categoryLink name="Elite Unit" hidden="false" id="2c17-638f-8896-d166" targetId="e020-218e-a38a-c7c5" primary="true"/>
       </categoryLinks>
+      <modifiers>
+        <modifier type="remove" value="4813-f768-c66b-e833" field="category"/>
+      </modifiers>
     </entryLink>
     <entryLink import="true" name="Minotaur" hidden="false" id="1bd3-16a7-e7f2-a4bc" type="selectionEntry" targetId="8b88-0927-59f1-6dd8">
       <categoryLinks>