diff --git a/Space Marines - Codex (2015).cat b/Space Marines - Codex (2015).cat
index aa4963f8..cfb3ad43 100644
--- a/Space Marines - Codex (2015).cat	
+++ b/Space Marines - Codex (2015).cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7ab0-ceb9-0a9f-f0b6" name="Space Marines: Codex" revision="2003" battleScribeVersion="2.00" authorName="Earl Bishop (Kohato)" authorContact="iam@earlb3.com" authorUrl="https://github.com/BSData/wh40kbs2/issues" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="7ab0-ceb9-0a9f-f0b6" name="Space Marines: Codex" revision="2004" battleScribeVersion="2.00" authorName="Earl Bishop (Kohato)" authorContact="iam@earlb3.com" authorUrl="https://github.com/BSData/wh40kbs2/issues" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules>
     <rule id="bab5-1920-a2ed-5b27" name="Vulkan&apos;s Teachings" book="Supplement: Angels of Death" hidden="false">
@@ -12412,15 +12412,7 @@ If the tank is Wrecked or suffers an Explodes! result, Sergeant Chronus is treat
                   <profiles/>
                   <rules/>
                   <infoLinks/>
-                  <modifiers>
-                    <modifier type="set" field="hidden" value="true">
-                      <repeats/>
-                      <conditions>
-                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9d4d-6636-abce-062b" type="lessThan"/>
-                      </conditions>
-                      <conditionGroups/>
-                    </modifier>
-                  </modifiers>
+                  <modifiers/>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4f03-72e6-cd72-c049" type="max"/>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4b72-0c9f-71cc-e900" type="min"/>
@@ -12439,7 +12431,15 @@ If the tank is Wrecked or suffers an Explodes! result, Sergeant Chronus is treat
                       <profiles/>
                       <rules/>
                       <infoLinks/>
-                      <modifiers/>
+                      <modifiers>
+                        <modifier type="set" field="hidden" value="true">
+                          <repeats/>
+                          <conditions>
+                            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9d4d-6636-abce-062b" type="lessThan"/>
+                          </conditions>
+                          <conditionGroups/>
+                        </modifier>
+                      </modifiers>
                       <constraints/>
                     </entryLink>
                   </entryLinks>
@@ -12456,31 +12456,6 @@ If the tank is Wrecked or suffers an Explodes! result, Sergeant Chronus is treat
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="defe-a36e-12cf-1ca8" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="0bdd-f29c-7e96-896d" name="" hidden="false" targetId="f8c3-890f-1aae-ca79" type="selectionEntry">
-                  <profiles/>
-                  <rules/>
-                  <infoLinks/>
-                  <modifiers>
-                    <modifier type="set" field="hidden" value="true">
-                      <repeats/>
-                      <conditions>
-                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9d4d-6636-abce-062b" type="greaterThan"/>
-                      </conditions>
-                      <conditionGroups/>
-                    </modifier>
-                    <modifier type="set" field="59a1-bfae-b550-ac01" value="0.0">
-                      <repeats/>
-                      <conditions>
-                        <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="9d4d-6636-abce-062b" type="greaterThan"/>
-                      </conditions>
-                      <conditionGroups/>
-                    </modifier>
-                  </modifiers>
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="59a1-bfae-b550-ac01" type="min"/>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dbbf-0474-02bc-f23a" type="max"/>
-                  </constraints>
-                </entryLink>
                 <entryLink id="8d82-a0c3-5ca7-052e" name="" hidden="false" targetId="2f28-0a8e-362d-a945" type="selectionEntry">
                   <profiles/>
                   <rules/>
@@ -25962,7 +25937,7 @@ If several models are in a position to capture Cypher, some of which are Dark An
               </constraints>
               <selectionEntries/>
               <selectionEntryGroups>
-                <selectionEntryGroup id="3e67-1307-4ba3-2217" name="Bolt Pistol Hand" hidden="false" collective="false">
+                <selectionEntryGroup id="3e67-1307-4ba3-2217" name="Bolt Pistol Hand" hidden="false" collective="false" defaultSelectionEntryId="bc41-d056-26fd-3d83">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -26082,26 +26057,125 @@ If several models are in a position to capture Cypher, some of which are Dark An
                     </entryLink>
                   </entryLinks>
                 </selectionEntryGroup>
-                <selectionEntryGroup id="9139-1b1b-ae42-1f33" name="Boltgun Hand" hidden="false" collective="false">
+                <selectionEntryGroup id="3766-7c34-ca29-4c03" name="Boltgun Hand" hidden="false" collective="false" defaultSelectionEntryId="fffc-a547-1af8-334e">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
                   <modifiers/>
                   <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1022-675d-441e-f438" type="max"/>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d25a-1d9d-c08a-e0dd" type="min"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7cb0-4aea-61f8-1c99" type="max"/>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d7bb-f856-3214-25aa" type="min"/>
                   </constraints>
                   <selectionEntries/>
                   <selectionEntryGroups/>
                   <entryLinks>
-                    <entryLink id="3904-a2f5-6efd-7d78" name="" hidden="false" targetId="f8c3-890f-1aae-ca79" type="selectionEntry">
+                    <entryLink id="fffc-a547-1af8-334e" name="" hidden="false" targetId="f8c3-890f-1aae-ca79" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers/>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="72b4-4fa4-5807-1903" name="" hidden="false" targetId="21a6-6e4c-aa61-2ff2" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers/>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="8ac3-4545-53ca-c701" name="" hidden="false" targetId="6e6a-f954-5a00-ca4b" type="selectionEntry">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
                       <modifiers/>
                       <constraints/>
                     </entryLink>
-                    <entryLink id="1b1a-c52e-d582-dcf8" name="" hidden="false" targetId="5654-d10a-9203-2beb" type="selectionEntry">
+                    <entryLink id="0c00-0355-06ab-008f" name="" hidden="false" targetId="a69d-81d9-e426-7b8a" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers>
+                        <modifier type="set" field="points" value="15">
+                          <repeats/>
+                          <conditions/>
+                          <conditionGroups/>
+                        </modifier>
+                      </modifiers>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="d26e-4395-82bb-8346" name="" hidden="false" targetId="3807-43f2-2759-6830" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers>
+                        <modifier type="set" field="points" value="25">
+                          <repeats/>
+                          <conditions/>
+                          <conditionGroups/>
+                        </modifier>
+                      </modifiers>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="d243-8191-4302-d8bf" name="" hidden="false" targetId="6e32-f17e-a2c9-2ab6" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers/>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="5499-1bdb-df61-d86b" name="" hidden="false" targetId="08af-d4ea-7eb3-1f26" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers>
+                        <modifier type="set" field="points" value="15">
+                          <repeats/>
+                          <conditions/>
+                          <conditionGroups/>
+                        </modifier>
+                      </modifiers>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="73a9-ec3f-1e9b-1450" name="" hidden="false" targetId="ce5d-e691-9afc-b0ae" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers>
+                        <modifier type="set" field="points" value="15">
+                          <repeats/>
+                          <conditions/>
+                          <conditionGroups/>
+                        </modifier>
+                      </modifiers>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="7162-d6ce-71d9-33bf" name="" hidden="false" targetId="9bb3-2f25-19b8-6dae" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers>
+                        <modifier type="set" field="points" value="15">
+                          <repeats/>
+                          <conditions/>
+                          <conditionGroups/>
+                        </modifier>
+                      </modifiers>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="1969-35b8-8f15-289b" name="" hidden="false" targetId="6bac-8add-bb1b-e197" type="selectionEntry">
+                      <profiles/>
+                      <rules/>
+                      <infoLinks/>
+                      <modifiers>
+                        <modifier type="set" field="points" value="15">
+                          <repeats/>
+                          <conditions/>
+                          <conditionGroups/>
+                        </modifier>
+                      </modifiers>
+                      <constraints/>
+                    </entryLink>
+                    <entryLink id="0595-0890-b5e6-6912" name="" hidden="false" targetId="5654-d10a-9203-2beb" type="selectionEntry">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -26114,7 +26188,7 @@ If several models are in a position to capture Cypher, some of which are Dark An
                       </modifiers>
                       <constraints/>
                     </entryLink>
-                    <entryLink id="3fb2-4006-2c74-0d59" name="" hidden="false" targetId="333f-a8ca-83c9-e7d7" type="selectionEntry">
+                    <entryLink id="367b-8419-b2c8-fee8" name="" hidden="false" targetId="333f-a8ca-83c9-e7d7" type="selectionEntry">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -26127,7 +26201,7 @@ If several models are in a position to capture Cypher, some of which are Dark An
                       </modifiers>
                       <constraints/>
                     </entryLink>
-                    <entryLink id="4b3e-8516-b4c0-992c" name="" hidden="false" targetId="fff9-5305-7d6b-68f1" type="selectionEntry">
+                    <entryLink id="faa6-ad0c-ac42-8888" name="" hidden="false" targetId="62a2-9d6d-f287-cb31" type="selectionEntry">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -26140,7 +26214,7 @@ If several models are in a position to capture Cypher, some of which are Dark An
                       </modifiers>
                       <constraints/>
                     </entryLink>
-                    <entryLink id="45f4-a8dc-3b19-2093" name="" hidden="false" targetId="62a2-9d6d-f287-cb31" type="selectionEntry">
+                    <entryLink id="e2f5-7017-5991-d601" name="" hidden="false" targetId="708d-7234-5888-19c0" type="selectionEntry">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -26153,7 +26227,7 @@ If several models are in a position to capture Cypher, some of which are Dark An
                       </modifiers>
                       <constraints/>
                     </entryLink>
-                    <entryLink id="16cc-f0f0-93f2-fb16" name="" hidden="false" targetId="708d-7234-5888-19c0" type="selectionEntry">
+                    <entryLink id="6380-9474-57de-de29" name="" hidden="false" targetId="fff9-5305-7d6b-68f1" type="selectionEntry">
                       <profiles/>
                       <rules/>
                       <infoLinks/>