diff --git a/2024 - Kill Team.gst b/2024 - Kill Team.gst
index 2e9cecd..56f1669 100644
--- a/2024 - Kill Team.gst	
+++ b/2024 - Kill Team.gst	
@@ -16,17 +16,17 @@
   <forceEntries>
     <forceEntry name="Roster" hidden="false" id="default-force">
       <categoryLinks>
-        <categoryLink name="Configuration" hidden="false" id="5041-7c63-3fcc-ec3a" targetId="874b-0390-e5e2-1daa" type="category"/>
-        <categoryLink name="Reference" hidden="false" id="e7e5-aba7-e523-ef50" targetId="b318-a8d7-2d38-99a3" type="category"/>
-        <categoryLink name="Leader" hidden="false" id="0f6c-6170-279e-f788" targetId="d999-8cad-8145-4efe" type="category"/>
-        <categoryLink name="Default Category" hidden="false" id="default-force-category-link" targetId="default-category">
+        <categoryLink name="Configuration" hidden="false" id="5041-7c63-3fcc-ec3a" targetId="874b-0390-e5e2-1daa"/>
+        <categoryLink name="Reference" hidden="false" id="e7e5-aba7-e523-ef50" targetId="b318-a8d7-2d38-99a3"/>
+        <categoryLink name="Leader" hidden="false" id="0f6c-6170-279e-f788" targetId="d999-8cad-8145-4efe"/>
+        <categoryLink name="Operative" hidden="false" id="default-force-category-link" targetId="default-category">
           <constraints>
-            <constraint type="max" value="20" field="selections" scope="roster" shared="true" id="3bf5-9bfe-930c-25f7" includeChildSelections="true"/>
+            <constraint type="max" value="20" field="selections" scope="roster" shared="true" id="f9df-3e4b-6c7d-4c5f" includeChildSelections="true"/>
           </constraints>
           <modifiers>
-            <modifier type="decrement" value="1" field="3bf5-9bfe-930c-25f7">
+            <modifier type="decrement" value="1" field="f9df-3e4b-6c7d-4c5f">
               <repeats>
-                <repeat value="1" repeats="1" field="selections" scope="roster" childId="d999-8cad-8145-4efe" shared="true" roundUp="false" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                <repeat value="1" repeats="1" field="selections" scope="default-force" childId="d999-8cad-8145-4efe" shared="true" roundUp="false"/>
               </repeats>
             </modifier>
           </modifiers>
@@ -76,31 +76,26 @@
     </profileType>
   </profileTypes>
   <sharedSelectionEntries>
-    <selectionEntry type="upgrade" import="true" name="Game Type" hidden="false" id="e5c2-0021-6a76-b0d1" collective="false">
-      <constraints>
-        <constraint type="min" value="1" field="selections" scope="force" shared="true" id="ea2b-52da-2d24-ff59"/>
-      </constraints>
-      <categoryLinks>
-        <categoryLink name="Configuration" hidden="false" id="8efd-8688-874a-626c" targetId="874b-0390-e5e2-1daa" primary="true"/>
-      </categoryLinks>
+    <selectionEntry type="upgrade" import="true" name="Game Type" hidden="false" id="d123-e60a-6dd3-e833">
       <selectionEntryGroups>
-        <selectionEntryGroup name="Game Type" id="87db-3109-9777-000e" hidden="false" collective="false" import="true" defaultSelectionEntryId="d576-59ea-7df7-cf3e">
-          <constraints>
-            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="a3f6-1d04-a3eb-5350-min"/>
-            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="a3f6-1d04-a3eb-5350-max"/>
-          </constraints>
+        <selectionEntryGroup name="Game Type" id="8b43-4cea-03ae-92d2" hidden="false" defaultSelectionEntryId="cd89-4b8e-4365-ac65">
           <selectionEntries>
-            <selectionEntry type="upgrade" import="true" name="Matched" hidden="false" id="cd4f-dfc1-5228-1e92" collective="false">
-              <costs>
-                <cost name="EP" typeId="c61a-51a3-370d-bf55" value="0"/>
-              </costs>
-            </selectionEntry>
+            <selectionEntry type="upgrade" import="true" name="Matched" hidden="false" id="cd89-4b8e-4365-ac65"/>
+            <selectionEntry type="upgrade" import="true" name="Joint Ops" hidden="false" id="1bf8-6040-c108-a189"/>
+            <selectionEntry type="upgrade" import="true" name="Narrative" hidden="false" id="6c0c-33ca-17a4-6516"/>
           </selectionEntries>
+          <constraints>
+            <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="cca3-4da5-b213-bd3a-min"/>
+            <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="cca3-4da5-b213-bd3a-max"/>
+          </constraints>
         </selectionEntryGroup>
       </selectionEntryGroups>
-      <costs>
-        <cost name="EP" typeId="c61a-51a3-370d-bf55" value="0"/>
-      </costs>
+      <constraints>
+        <constraint type="min" value="1" field="selections" scope="parent" shared="true" id="016c-c3cd-6a66-0929"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink name="Configuration" hidden="false" id="3797-a874-5eb6-1878" targetId="874b-0390-e5e2-1daa" primary="true"/>
+      </categoryLinks>
     </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
@@ -111,6 +106,6 @@
     <rule name="Range x" id="a528-829e-8268-c005" hidden="false"/>
   </sharedRules>
   <entryLinks>
-    <entryLink import="true" name="Game Type" hidden="false" id="990c-eba1-6627-d699" type="selectionEntry" targetId="e5c2-0021-6a76-b0d1"/>
+    <entryLink import="true" name="Test" hidden="false" id="df77-17f0-9e2b-67a4" type="selectionEntry" targetId="d123-e60a-6dd3-e833"/>
   </entryLinks>
 </gameSystem>
diff --git a/2024 - Ork Kommandos.cat b/2024 - Ork Kommandos.cat
index 68c7008..288da9e 100644
--- a/2024 - Ork Kommandos.cat	
+++ b/2024 - Ork Kommandos.cat	
@@ -6,7 +6,7 @@
         <categoryLink name="Ork" hidden="false" id="50c6-9d89-7b7a-d49d" targetId="c459-8b6a-74b6-9329" primary="false"/>
         <categoryLink name="Dakka Boy" hidden="false" id="ac2d-ca6f-1ffd-fb06" targetId="18e1-ce84-9d92-86ee" primary="false"/>
         <categoryLink name="KOMMANDO" hidden="false" id="bf7f-ccbc-3acc-20e1" targetId="adac-44bf-e1d4-1e4e" primary="false"/>
-        <categoryLink name="Operative" hidden="false" id="5df9-3fe8-47f8-140f" targetId="default-category" primary="false"/>
+        <categoryLink name="Operative" hidden="false" id="1f32-37da-8a70-1a4c" targetId="default-category" primary="true"/>
       </categoryLinks>
       <profiles>
         <profile name="Kommando Dakka Boy" typeId="5156-3fb9-39ce-7bdb" typeName="Operative" hidden="false" id="903a-55fa-2389-6f54">
@@ -85,9 +85,9 @@ This operative cannot perform this action while within control range of an enemy
   <forceEntries>
     <forceEntry name="Ork Kommandos Kill Team" id="2f7a-48f9-f636-fffc" hidden="false">
       <categoryLinks>
-        <categoryLink name="Configuration" hidden="false" id="c4d1-8218-800f-b16f" targetId="874b-0390-e5e2-1daa" type="category"/>
-        <categoryLink name="Operative" hidden="false" id="bb66-a334-d34e-5374" targetId="default-category" type="category"/>
-        <categoryLink name="Leader" hidden="false" id="18f5-41c3-d17e-05fd" targetId="d999-8cad-8145-4efe" type="category"/>
+        <categoryLink name="Configuration" hidden="false" id="c4d1-8218-800f-b16f" targetId="874b-0390-e5e2-1daa"/>
+        <categoryLink name="Operative" hidden="false" id="bb66-a334-d34e-5374" targetId="default-category"/>
+        <categoryLink name="Leader" hidden="false" id="18f5-41c3-d17e-05fd" targetId="d999-8cad-8145-4efe"/>
       </categoryLinks>
     </forceEntry>
   </forceEntries>
diff --git a/2024 - Vespid Stingwings.cat b/2024 - Vespid Stingwings.cat
index 452bc54..5f56ed5 100644
--- a/2024 - Vespid Stingwings.cat	
+++ b/2024 - Vespid Stingwings.cat	
@@ -6,7 +6,7 @@
         <categoryLink name="T&apos;au Empire" hidden="false" id="7dcd-58c7-0d27-0aa5" targetId="20d3-6a95-40e4-de61" primary="false"/>
         <categoryLink name="VESPID STINGWING" hidden="false" id="affc-4938-92bc-703e" targetId="af34-52dc-5007-9d1a" primary="false"/>
         <categoryLink name="Skyblast" hidden="false" id="e21e-81c5-b4c9-3fe0" targetId="8933-4653-c8cb-cf8c" primary="false"/>
-        <categoryLink name="Operative" hidden="false" id="8ae6-1d15-a5d4-9942" targetId="default-category" primary="false"/>
+        <categoryLink name="Operative" hidden="false" id="422f-c450-f817-ecf9" targetId="default-category" primary="true"/>
       </categoryLinks>
       <selectionEntries>
         <selectionEntry type="upgrade" import="true" name="Neutron grenade launcher" hidden="false" id="8041-ca9a-4519-c6bb">
@@ -79,9 +79,9 @@
   <forceEntries>
     <forceEntry name="Vespid Stingwings Kill Team" id="bbc7-3b8c-b2cc-29d3" hidden="false">
       <categoryLinks>
-        <categoryLink name="Configuration" hidden="false" id="71a0-5396-3850-1b25" targetId="874b-0390-e5e2-1daa" type="category"/>
-        <categoryLink name="Operative" hidden="false" id="ca03-5848-26c2-f7bf" targetId="default-category" type="category"/>
-        <categoryLink name="Leader" hidden="false" id="71b2-5000-69ee-97d5" targetId="d999-8cad-8145-4efe" type="category"/>
+        <categoryLink name="Configuration" hidden="false" id="71a0-5396-3850-1b25" targetId="874b-0390-e5e2-1daa"/>
+        <categoryLink name="Operative" hidden="false" id="ca03-5848-26c2-f7bf" targetId="default-category"/>
+        <categoryLink name="Leader" hidden="false" id="71b2-5000-69ee-97d5" targetId="d999-8cad-8145-4efe"/>
       </categoryLinks>
     </forceEntry>
   </forceEntries>