diff --git a/dreadElves.cat b/dreadElves.cat
index 907e641..3b6c038 100644
--- a/dreadElves.cat
+++ b/dreadElves.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b930-cfad-b2dc-3cc3" name="Dread Elves" revision="7" battleScribeVersion="2.03" authorName="DarkSky" library="false" gameSystemId="8c9a-3026-84b4-cf16" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b930-cfad-b2dc-3cc3" name="Dread Elves" revision="8" battleScribeVersion="2.03" authorName="DarkSky" library="false" gameSystemId="8c9a-3026-84b4-cf16" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="3a14-99d4-8059-140f" name="The Menagerie" hidden="false"/>
     <categoryEntry id="d761-542f-a7ba-bb88" name="Raiders" hidden="false"/>
@@ -754,16 +754,6 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f952-b6ab-f79a-29d8" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ce3b-6f00-8614-f2ff" type="max"/>
           </constraints>
-          <selectionEntries>
-            <selectionEntry id="44b0-882c-0360-995e" name="Captain and Attached" 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="7366-b723-7616-e0a9" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="pts" typeId="24fd-8af8-0c78-001c" value="0.0"/>
-              </costs>
-            </selectionEntry>
-          </selectionEntries>
           <entryLinks>
             <entryLink id="d7fb-666c-a79a-9eef" name="Army General" hidden="false" collective="false" import="true" targetId="d664-b973-594c-5971" type="selectionEntry">
               <modifiers>
@@ -786,6 +776,7 @@
                 <cost name="pts" typeId="24fd-8af8-0c78-001c" value="50.0"/>
               </costs>
             </entryLink>
+            <entryLink id="1274-5d82-e34a-e47c" name="Captain and Attached" hidden="false" collective="false" import="true" targetId="1dee-cdb4-b5b9-12ba" type="selectionEntry"/>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -3632,27 +3623,20 @@
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="410d-faa0-c68d-173b" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="471f-ab7e-72d1-456c" name="Ice and Fire" hidden="false" collective="false" import="true" type="upgrade">
-              <costs>
-                <cost name="pts" typeId="24fd-8af8-0c78-001c" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="f6b5-4ff9-ba7c-a6f1" name="Whispers of the Veil" hidden="false" collective="false" import="true" type="upgrade">
-              <costs>
-                <cost name="pts" typeId="24fd-8af8-0c78-001c" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="d317-d5b5-6e53-1b2d" name="Illusory Paths" hidden="false" collective="false" import="true" type="upgrade">
-              <costs>
-                <cost name="pts" typeId="24fd-8af8-0c78-001c" value="0.0"/>
-              </costs>
-            </selectionEntry>
             <selectionEntry id="7004-017a-50e4-68f7" name="Curse of the Phantom Queen" 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="0140-63b6-9652-60cb" type="max"/>
+              </constraints>
               <costs>
                 <cost name="pts" typeId="24fd-8af8-0c78-001c" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
+          <entryLinks>
+            <entryLink id="0895-e3c4-0616-a87a" name="Spell: (Cos4) Ice and Fire" hidden="false" collective="false" import="true" targetId="9a28-7726-57b4-fa6d" type="selectionEntry"/>
+            <entryLink id="2611-e775-4a8a-eb2c" name="Spell: (Wit3) Illusory Paths" hidden="false" collective="false" import="true" targetId="e9f1-c19b-0b9f-b60a" type="selectionEntry"/>
+            <entryLink id="6310-6e7e-67e1-9170" name="Spell: (Evo1) Whispers of the Veil" hidden="false" collective="false" import="true" targetId="312f-9421-1a32-6df4" type="selectionEntry"/>
+          </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
diff --git a/empireOfSonnstahl.cat b/empireOfSonnstahl.cat
index 699b7a4..1917dce 100644
--- a/empireOfSonnstahl.cat
+++ b/empireOfSonnstahl.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b930-cfad-b2dc-3cc3" name="Empire of Sonnstahl" revision="3" battleScribeVersion="2.03" authorName="DarkSky" library="false" gameSystemId="8c9a-3026-84b4-cf16" gameSystemRevision="5" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b930-cfad-b2dc-3cc3" name="Empire of Sonnstahl" revision="4" battleScribeVersion="2.03" authorName="DarkSky" library="false" gameSystemId="8c9a-3026-84b4-cf16" gameSystemRevision="6" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="ad88-58e2-e12d-1a38" name="Core Cavalry" hidden="false"/>
     <categoryEntry id="0730-0fd0-cf63-4684" name="Imperial Auxiliaries" hidden="false"/>
@@ -249,16 +249,6 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c5df-0990-8df6-df39" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2cdb-da71-a4f9-adfc" type="max"/>
           </constraints>
-          <selectionEntries>
-            <selectionEntry id="ac50-4375-f6b6-01a6" name="Captain, Attached" 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="7b98-a173-18d6-378d" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="pts" typeId="24fd-8af8-0c78-001c" value="0.0"/>
-              </costs>
-            </selectionEntry>
-          </selectionEntries>
           <entryLinks>
             <entryLink id="7fcb-ca48-71b6-d467" name="Army General" hidden="false" collective="false" import="true" targetId="d664-b973-594c-5971" type="selectionEntry">
               <modifiers>
@@ -276,6 +266,7 @@
                 <cost name="pts" typeId="24fd-8af8-0c78-001c" value="50.0"/>
               </costs>
             </entryLink>
+            <entryLink id="bbf3-2b99-8a0a-485b" name="Captain and Attached" hidden="false" collective="false" import="true" targetId="1dee-cdb4-b5b9-12ba" type="selectionEntry"/>
           </entryLinks>
         </selectionEntryGroup>
         <selectionEntryGroup id="48ab-04c2-9aa2-c6a7" name="Special Equipment" hidden="false" collective="false" import="true">