diff --git a/Genestealer Cults - Codex.cat b/Genestealer Cults - Codex.cat
index de3e335c..27ed2395 100644
--- a/Genestealer Cults - Codex.cat	
+++ b/Genestealer Cults - Codex.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="f840-ed73-44ab-3d6a" revision="7" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="46" battleScribeVersion="1.15" name="Genestealer Cults - Codex" books="Codex: Genestealer Cults" authorName="GenWilhelm" authorContact="" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="f840-ed73-44ab-3d6a" revision="8" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="46" battleScribeVersion="1.15" name="Genestealer Cults - Codex" books="Codex: Genestealer Cults" authorName="GenWilhelm" authorContact="" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <entries>
     <entry id="9b30-18fa-bed4-4722" name="Brood Brothers" points="0.0" categoryId="ef2b-83bd-1bad-5742" type="upgrade" minSelections="0" maxSelections="-1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
       <entries/>
@@ -481,7 +481,7 @@
             <entry id="9ef8-0750-b75b-5c08" name="Acolyte Hybrid w/ Heavy Weapon" points="8.0" categoryId="(No Category)" type="model" minSelections="0" maxSelections="0" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
               <entries/>
               <entryGroups>
-                <entryGroup id="cfde-53a6-8466-46f0" name="Weapons" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                <entryGroup id="cfde-53a6-8466-46f0" name="Heavy Weapon" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
                   <entries>
                     <entry id="6466-0303-9409-c34e" name="Demolition Charge" points="20.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
                       <entries/>
@@ -542,9 +542,40 @@
                   <modifiers/>
                   <links/>
                 </entryGroup>
+                <entryGroup id="48d8-f4dc-57dd-82bc" name="Pistol" defaultEntryId="c931-0ac4-afab-422e" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                  <entries>
+                    <entry id="96cb-e426-5631-0b2a" name="Hand Flamer" points="5.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                      <entries/>
+                      <entryGroups/>
+                      <modifiers/>
+                      <rules/>
+                      <profiles/>
+                      <links>
+                        <link id="d60f-181c-c21a-8d42" targetId="23cb-da6e-7135-b560" linkType="profile">
+                          <modifiers/>
+                        </link>
+                      </links>
+                    </entry>
+                    <entry id="c931-0ac4-afab-422e" name="Autopistol" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                      <entries/>
+                      <entryGroups/>
+                      <modifiers/>
+                      <rules/>
+                      <profiles/>
+                      <links>
+                        <link id="dec1-c711-33e3-9906" targetId="a3a6-6fad-f016-8413" linkType="profile">
+                          <modifiers/>
+                        </link>
+                      </links>
+                    </entry>
+                  </entries>
+                  <entryGroups/>
+                  <modifiers/>
+                  <links/>
+                </entryGroup>
               </entryGroups>
               <modifiers>
-                <modifier type="increment" field="maxSelections" value="1.0" repeat="true" numRepeats="1" incrementParentId="b90c-69ee-69b1-3ffa" incrementChildId="76c2-33e7-d0e5-7bb7" incrementField="selections" incrementValue="5.0">
+                <modifier type="increment" field="maxSelections" value="2.0" repeat="true" numRepeats="1" incrementParentId="b90c-69ee-69b1-3ffa" incrementChildId="76c2-33e7-d0e5-7bb7" incrementField="selections" incrementValue="5.0">
                   <conditions/>
                   <conditionGroups/>
                 </modifier>
@@ -558,9 +589,6 @@
                 <link id="9f4d-0199-60d4-8233" targetId="e340-f3f5-d460-0e45" linkType="entry">
                   <modifiers/>
                 </link>
-                <link id="ebbd-eaf7-c864-a9cc" targetId="5177-153f-603f-c73b" linkType="entry">
-                  <modifiers/>
-                </link>
               </links>
             </entry>
             <entry id="c841-696e-6f0d-1a3e" name="Acolyte Hybrid w/ Hand Flamer" points="8.0" categoryId="(No Category)" type="model" minSelections="0" maxSelections="20" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
@@ -1560,7 +1588,39 @@ Primus: Preferred Enemy
                       </links>
                     </entry>
                   </entries>
-                  <entryGroups/>
+                  <entryGroups>
+                    <entryGroup id="2504-f8a6-61d2-7a3b" name="Pistol" defaultEntryId="95d5-be1b-4cb6-c9cd" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                      <entries>
+                        <entry id="a0bc-7ffc-2d68-a8e3" name="Hand Flamer" points="5.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                          <entries/>
+                          <entryGroups/>
+                          <modifiers/>
+                          <rules/>
+                          <profiles/>
+                          <links>
+                            <link id="de62-2919-3ee5-002e" targetId="23cb-da6e-7135-b560" linkType="profile">
+                              <modifiers/>
+                            </link>
+                          </links>
+                        </entry>
+                        <entry id="95d5-be1b-4cb6-c9cd" name="Autopistol" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                          <entries/>
+                          <entryGroups/>
+                          <modifiers/>
+                          <rules/>
+                          <profiles/>
+                          <links>
+                            <link id="55cb-bc15-bc86-232d" targetId="a3a6-6fad-f016-8413" linkType="profile">
+                              <modifiers/>
+                            </link>
+                          </links>
+                        </entry>
+                      </entries>
+                      <entryGroups/>
+                      <modifiers/>
+                      <links/>
+                    </entryGroup>
+                  </entryGroups>
                   <modifiers/>
                   <rules/>
                   <profiles/>
@@ -1571,9 +1631,6 @@ Primus: Preferred Enemy
                     <link id="91ec-6518-46e4-66ba" targetId="e340-f3f5-d460-0e45" linkType="entry">
                       <modifiers/>
                     </link>
-                    <link id="c111-ec40-5309-ba4a" targetId="5177-153f-603f-c73b" linkType="entry">
-                      <modifiers/>
-                    </link>
                   </links>
                 </entry>
               </entries>
@@ -1740,10 +1797,44 @@ Primus: Preferred Enemy
                         </link>
                       </links>
                     </entry>
-                    <entry id="25da-d8d7-c678-3087" name="Acolyte Hybrid w/ Heavy Weapon" points="8.0" categoryId="(No Category)" type="model" minSelections="0" maxSelections="-1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                    <entry id="de47-cfd2-b66e-3a24" name="Acolyte Hybrid w/ Hand Flamer" points="8.0" categoryId="(No Category)" type="model" minSelections="0" maxSelections="19" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                      <entries>
+                        <entry id="6fb3-03bd-e451-44e6" name="Hand Flamer" points="5.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false">
+                          <entries/>
+                          <entryGroups/>
+                          <modifiers/>
+                          <rules/>
+                          <profiles/>
+                          <links>
+                            <link id="04bb-99f9-01b7-ae72" targetId="23cb-da6e-7135-b560" linkType="profile">
+                              <modifiers/>
+                            </link>
+                          </links>
+                        </entry>
+                      </entries>
+                      <entryGroups/>
+                      <modifiers/>
+                      <rules/>
+                      <profiles/>
+                      <links>
+                        <link id="878f-0c43-1e52-2475" targetId="4dda-d79e-8b0f-32f3" linkType="profile">
+                          <modifiers/>
+                        </link>
+                        <link id="f400-972f-dffa-7dab" targetId="9d00-f952-9bae-5293" linkType="entry">
+                          <modifiers/>
+                        </link>
+                        <link id="2914-634a-604f-ead5" targetId="e340-f3f5-d460-0e45" linkType="entry">
+                          <modifiers/>
+                        </link>
+                        <link id="cf11-54d4-4bdf-6bba" targetId="5177-153f-603f-c73b" linkType="entry">
+                          <modifiers/>
+                        </link>
+                      </links>
+                    </entry>
+                    <entry id="18c0-da0b-6bf4-fa1d" name="Acolyte Hybrid w/ Heavy Weapon" points="8.0" categoryId="(No Category)" type="model" minSelections="0" maxSelections="-1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
                       <entries/>
                       <entryGroups>
-                        <entryGroup id="2b6f-d727-dfa9-2183" name="Weapons" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                        <entryGroup id="2b6f-d727-dfa9-2183" name="Heavy Weapon" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
                           <entries>
                             <entry id="fb59-0f0c-dfa9-f583" name="Demolition Charge" points="20.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
                               <entries/>
@@ -1764,7 +1855,10 @@ Primus: Preferred Enemy
                               <rules/>
                               <profiles/>
                               <links>
-                                <link id="2e67-dc46-eace-68bb" targetId="857b-6d42-230e-8e0d" linkType="profile">
+                                <link id="2629-4508-06fa-9c4a" targetId="857b-6d42-230e-8e0d" linkType="profile">
+                                  <modifiers/>
+                                </link>
+                                <link id="7218-d6d5-d746-9cdd" targetId="abd2-de87-26fb-c254" linkType="rule">
                                   <modifiers/>
                                 </link>
                               </links>
@@ -1788,7 +1882,41 @@ Primus: Preferred Enemy
                               <rules/>
                               <profiles/>
                               <links>
-                                <link id="de51-6796-e9f4-5e2c" targetId="0eeb-4158-97a3-838e" linkType="profile">
+                                <link id="84e3-574b-7261-e652" targetId="0eeb-4158-97a3-838e" linkType="profile">
+                                  <modifiers/>
+                                </link>
+                                <link id="eecd-51e4-b0b3-e1e9" targetId="1219-8219-ab18-839a" linkType="rule">
+                                  <modifiers/>
+                                </link>
+                              </links>
+                            </entry>
+                          </entries>
+                          <entryGroups/>
+                          <modifiers/>
+                          <links/>
+                        </entryGroup>
+                        <entryGroup id="85f4-3b5b-c2a9-7e65" name="Pistol" defaultEntryId="2e86-3ab1-f113-8d47" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                          <entries>
+                            <entry id="384e-98d1-5628-2367" name="Hand Flamer" points="5.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                              <entries/>
+                              <entryGroups/>
+                              <modifiers/>
+                              <rules/>
+                              <profiles/>
+                              <links>
+                                <link id="aea0-ca87-1a39-982e" targetId="23cb-da6e-7135-b560" linkType="profile">
+                                  <modifiers/>
+                                </link>
+                              </links>
+                            </entry>
+                            <entry id="2e86-3ab1-f113-8d47" name="Autopistol" points="0.0" categoryId="(No Category)" type="upgrade" minSelections="0" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
+                              <entries/>
+                              <entryGroups/>
+                              <modifiers/>
+                              <rules/>
+                              <profiles/>
+                              <links>
+                                <link id="e67f-9e62-38bd-8112" targetId="a3a6-6fad-f016-8413" linkType="profile">
                                   <modifiers/>
                                 </link>
                               </links>
@@ -1800,7 +1928,7 @@ Primus: Preferred Enemy
                         </entryGroup>
                       </entryGroups>
                       <modifiers>
-                        <modifier type="increment" field="maxSelections" value="1.0" repeat="true" numRepeats="1" incrementParentId="9929-2725-c253-4535" incrementChildId="f16d-ee83-4799-1d17" incrementField="selections" incrementValue="5.0">
+                        <modifier type="increment" field="maxSelections" value="2.0" repeat="true" numRepeats="1" incrementParentId="9929-2725-c253-4535" incrementChildId="f16d-ee83-4799-1d17" incrementField="selections" incrementValue="5.0">
                           <conditions/>
                           <conditionGroups/>
                         </modifier>
@@ -1808,47 +1936,10 @@ Primus: Preferred Enemy
                       <rules/>
                       <profiles/>
                       <links>
-                        <link id="0b25-a613-8911-dfc2" targetId="4dda-d79e-8b0f-32f3" linkType="profile">
-                          <modifiers/>
-                        </link>
-                        <link id="4ed2-aac8-264f-e57f" targetId="e340-f3f5-d460-0e45" linkType="entry">
+                        <link id="293f-f976-d31d-3960" targetId="4dda-d79e-8b0f-32f3" linkType="profile">
                           <modifiers/>
                         </link>
-                        <link id="d0b6-3dae-643b-344f" targetId="5177-153f-603f-c73b" linkType="entry">
-                          <modifiers/>
-                        </link>
-                      </links>
-                    </entry>
-                    <entry id="de47-cfd2-b66e-3a24" name="Acolyte Hybrid w/ Hand Flamer" points="8.0" categoryId="(No Category)" type="model" minSelections="0" maxSelections="19" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="false" hidden="false">
-                      <entries>
-                        <entry id="6fb3-03bd-e451-44e6" name="Hand Flamer" points="5.0" categoryId="(No Category)" type="upgrade" minSelections="1" maxSelections="1" minInForce="0" maxInForce="-1" minInRoster="0" maxInRoster="-1" minPoints="0.0" maxPoints="-1.0" collective="true" hidden="false">
-                          <entries/>
-                          <entryGroups/>
-                          <modifiers/>
-                          <rules/>
-                          <profiles/>
-                          <links>
-                            <link id="04bb-99f9-01b7-ae72" targetId="23cb-da6e-7135-b560" linkType="profile">
-                              <modifiers/>
-                            </link>
-                          </links>
-                        </entry>
-                      </entries>
-                      <entryGroups/>
-                      <modifiers/>
-                      <rules/>
-                      <profiles/>
-                      <links>
-                        <link id="878f-0c43-1e52-2475" targetId="4dda-d79e-8b0f-32f3" linkType="profile">
-                          <modifiers/>
-                        </link>
-                        <link id="f400-972f-dffa-7dab" targetId="9d00-f952-9bae-5293" linkType="entry">
-                          <modifiers/>
-                        </link>
-                        <link id="2914-634a-604f-ead5" targetId="e340-f3f5-d460-0e45" linkType="entry">
-                          <modifiers/>
-                        </link>
-                        <link id="cf11-54d4-4bdf-6bba" targetId="5177-153f-603f-c73b" linkType="entry">
+                        <link id="8fbb-c2d3-76a6-f30c" targetId="e340-f3f5-d460-0e45" linkType="entry">
                           <modifiers/>
                         </link>
                       </links>