diff --git a/Grey Knights.cat b/Grey Knights.cat
index 071642c..72dd1af 100644
--- a/Grey Knights.cat	
+++ b/Grey Knights.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="af25-b676-5b53-c0dd" name="Grey Knights" revision="15" battleScribeVersion="2.02" authorUrl="https://battlescribedata.appspot.com/#/repo/wh40k-killteam" library="false" gameSystemId="a467-5f42-d24c-6e5b" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="af25-b676-5b53-c0dd" name="Grey Knights" revision="16" battleScribeVersion="2.02" authorUrl="https://battlescribedata.appspot.com/#/repo/wh40k-killteam" library="false" gameSystemId="a467-5f42-d24c-6e5b" gameSystemRevision="1" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="5fc1-6211-fd6d-0475" name="Paladin" hidden="false"/>
     <categoryEntry id="0b48-ec51-a0be-2aa7" name="Grey Knight" hidden="false"/>
@@ -1011,15 +1011,10 @@
     </selectionEntry>
     <selectionEntry id="a33d-1435-dd43-fa42" name="Terminator Gunner" hidden="false" collective="false" type="model">
       <modifiers>
-        <modifier type="set" field="9f0d-e8b0-bc0a-f7c5" value="2">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7c0b-7da1-facd-d326" type="atLeast"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
+        <modifier type="set" field="9f0d-e8b0-bc0a-f7c5" value="2.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="atLeast"/>
+          </conditions>
         </modifier>
         <modifier type="increment" field="5291-dc2c-cfa5-a77f" value="1">
           <repeats>
@@ -1082,15 +1077,10 @@
     </selectionEntry>
     <selectionEntry id="aa94-79d5-3fd7-7d96" name="Terminator Justicar" hidden="false" collective="false" type="model">
       <modifiers>
-        <modifier type="set" field="00b3-2971-be6b-4809" value="1">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7c0b-7da1-facd-d326" type="atLeast"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
+        <modifier type="set" field="00b3-2971-be6b-4809" value="1.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="atLeast"/>
+          </conditions>
         </modifier>
         <modifier type="increment" field="5291-dc2c-cfa5-a77f" value="1">
           <repeats>
@@ -1242,15 +1232,10 @@
     </selectionEntry>
     <selectionEntry id="2097-8a8f-2268-182e" name="Paladin Gunner" hidden="false" collective="false" type="model">
       <modifiers>
-        <modifier type="set" field="9e41-76fe-8e0e-27a9" value="2">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7c0b-7da1-facd-d326" type="atLeast"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
+        <modifier type="set" field="9e41-76fe-8e0e-27a9" value="2.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="atLeast"/>
+          </conditions>
         </modifier>
         <modifier type="increment" field="5291-dc2c-cfa5-a77f" value="1">
           <repeats>
@@ -1314,15 +1299,10 @@
     </selectionEntry>
     <selectionEntry id="8053-77ac-a082-6485" name="Paragon" hidden="false" collective="false" type="model">
       <modifiers>
-        <modifier type="set" field="d3a9-6aef-d193-f5b9" value="1">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="7c0b-7da1-facd-d326" type="atLeast"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
+        <modifier type="set" field="d3a9-6aef-d193-f5b9" value="1.0">
+          <conditions>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="c0f7-c442-b695-bf07" type="atLeast"/>
+          </conditions>
         </modifier>
         <modifier type="increment" field="5291-dc2c-cfa5-a77f" value="1">
           <repeats>