diff --git a/Ynnari Aeldari - Supplement.cat b/Ynnari Aeldari - Supplement.cat
index a82aee8e..c2f3bc16 100644
--- a/Ynnari Aeldari - Supplement.cat	
+++ b/Ynnari Aeldari - Supplement.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="d744-5cc5-263e-13ca" name="Ynnari Aeldari: Fracture of Biel-Tan (2017)" book="Gathering Storm: Fracture of Biel-Tan" revision="2014" battleScribeVersion="2.00" authorName="Earl Bishop" authorContact="https://gitter.im/BSData/wh40k" authorUrl="https://github.com/BSData/wh40k" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="d744-5cc5-263e-13ca" name="Ynnari Aeldari: Fracture of Biel-Tan (2017)" book="Gathering Storm: Fracture of Biel-Tan" revision="2013" battleScribeVersion="2.00" authorName="Earl Bishop" authorContact="https://gitter.im/BSData/wh40k" authorUrl="https://github.com/BSData/wh40k" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -2037,26 +2037,48 @@
           <selectionEntryGroups/>
           <entryLinks/>
         </selectionEntryGroup>
-      </selectionEntryGroups>
-      <entryLinks>
-        <entryLink id="f669-111c-6730-d231" name="" hidden="false" targetId="34c6-8d9e-8940-8b0c" type="selectionEntry">
+        <selectionEntryGroup id="0bb4-3372-bec5-f986" name="Wyches/Bloodbrides" book="" hidden="false" collective="false">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers/>
           <constraints>
-            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c3bc-fd29-9c74-5c47" type="min"/>
-            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b856-6d10-41b5-bd77" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d3e4-56fb-252d-c6fe" type="min"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="18f2-6d86-f75b-d1af" type="max"/>
           </constraints>
-        </entryLink>
-        <entryLink id="5232-4aa1-ef5a-fa7d" name="" hidden="false" targetId="dc2f-367b-62a1-b944" type="selectionEntry">
+          <selectionEntries/>
+          <selectionEntryGroups/>
+          <entryLinks>
+            <entryLink id="ea1e-9d77-ae83-ee8f" name="" hidden="false" targetId="dc2f-367b-62a1-b944" type="selectionEntry">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="149e-6f06-ed05-6074" type="max"/>
+              </constraints>
+            </entryLink>
+            <entryLink id="a39a-e1d3-9867-1293" name="" hidden="false" targetId="88ba-fc27-8fd8-2d86" type="selectionEntry">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="310b-4a70-62b5-e67a" type="max"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <entryLinks>
+        <entryLink id="f669-111c-6730-d231" name="" hidden="false" targetId="34c6-8d9e-8940-8b0c" type="selectionEntry">
           <profiles/>
           <rules/>
           <infoLinks/>
           <modifiers/>
           <constraints>
-            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ff8d-55ee-8dfe-febc" type="min"/>
-            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="478a-ebed-4409-93f4" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c3bc-fd29-9c74-5c47" type="min"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b856-6d10-41b5-bd77" type="max"/>
           </constraints>
         </entryLink>
       </entryLinks>
@@ -2100,7 +2122,40 @@
       <modifiers/>
       <constraints/>
       <selectionEntries/>
-      <selectionEntryGroups/>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="3893-811b-6cd9-ca5c" name="Wyches/Bloodbrides" book="" hidden="false" collective="false">
+          <profiles/>
+          <rules/>
+          <infoLinks/>
+          <modifiers/>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="56dc-7b2c-8219-460f" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3fe5-8c0a-3bda-7215" type="max"/>
+          </constraints>
+          <selectionEntries/>
+          <selectionEntryGroups/>
+          <entryLinks>
+            <entryLink id="3f5d-d2c7-3bf3-fa1e" name="" hidden="false" targetId="dc2f-367b-62a1-b944" type="selectionEntry">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3b9b-a89e-965e-48bd" type="max"/>
+              </constraints>
+            </entryLink>
+            <entryLink id="e591-4d1a-3613-4dab" name="" hidden="false" targetId="88ba-fc27-8fd8-2d86" type="selectionEntry">
+              <profiles/>
+              <rules/>
+              <infoLinks/>
+              <modifiers/>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4516-b76e-49df-59b5" type="max"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
       <entryLinks>
         <entryLink id="4501-7871-cc2c-8d0d" name="" hidden="false" targetId="7771-7674-8093-ae23" type="selectionEntry">
           <profiles/>
@@ -2122,16 +2177,6 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7782-8ff6-74d5-4ef7" type="min"/>
           </constraints>
         </entryLink>
-        <entryLink id="4fd3-686b-2de5-c148" name="" hidden="false" targetId="dc2f-367b-62a1-b944" type="selectionEntry">
-          <profiles/>
-          <rules/>
-          <infoLinks/>
-          <modifiers/>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2635-6d74-ad18-dfe8" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5c51-94e6-732e-d498" type="min"/>
-          </constraints>
-        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" costTypeId="points" value="0.0"/>
@@ -2956,7 +3001,7 @@
           <infoLinks/>
           <modifiers/>
           <characteristics>
-            <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="All friendly units within 12&quot; of a model with the Laughing God&apos;s Eye have the Adamantium Will special rule."/>
+            <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="All friendly units within 12&quot; of a model with the Laughing God’s Eye have the Adamantium Will special rule."/>
           </characteristics>
         </profile>
       </profiles>
@@ -3091,7 +3136,7 @@
           <infoLinks/>
           <modifiers/>
           <characteristics>
-            <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="Every time the bearer of the Spirit Stone of Anath&apos;lan attempts to manifest a psychic power, he can choose to reduce the Warp Charge cost by 1 (to a minimum of 1). If he does so, he cannot use his rune armour&apos;s invulnerable save until the start of his next turn."/>
+            <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="Every time the bearer of the Spirit Stone of Anath’lan attempts to manifest a psychic power, he can choose to reduce the Warp Charge cost by 1 (to a minimum of 1). If he does so, he cannot use his rune armour’s invulnerable save until the start of his next turn."/>
           </characteristics>
         </profile>
       </profiles>
@@ -3191,7 +3236,7 @@
           <infoLinks/>
           <modifiers/>
           <characteristics>
-            <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="A model with Faolchu&apos;s Wing can Run up to 48&quot; in its Shooting phase, provided that it did not manifest any psychic powers or shoot this turn. If it does so it cannot shoot or charge for the remainder of the turn. However, the model can re-roll failed cover saves until the start of its next turn."/>
+            <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="A model with Faolchu’s Wing can Run up to 48&quot; in its Shooting phase, provided that it did not manifest any psychic powers or shoot this turn. If it does so it cannot shoot or charge for the remainder of the turn. However, the model can re-roll failed cover saves until the start of its next turn."/>
           </characteristics>
         </profile>
       </profiles>
@@ -9367,7 +9412,9 @@
                   <rules/>
                   <infoLinks/>
                   <modifiers/>
-                  <constraints/>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="721a-7ca8-c7c1-4f08" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="9f47-c77b-f395-540d" name="" hidden="false" targetId="683a-c1e6-c15e-f5af" type="selectionEntry">
                   <profiles/>
@@ -9380,7 +9427,9 @@
                       <conditionGroups/>
                     </modifier>
                   </modifiers>
-                  <constraints/>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="19c1-dda3-bdbc-f6b6" type="max"/>
+                  </constraints>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
@@ -9407,7 +9456,9 @@
                       <conditionGroups/>
                     </modifier>
                   </modifiers>
-                  <constraints/>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="badd-22f6-6d71-ab2b" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="abe5-8270-1510-3ee0" name="" hidden="false" targetId="20eb-a85d-9e87-960e" type="selectionEntry">
                   <profiles/>
@@ -9420,7 +9471,9 @@
                       <conditionGroups/>
                     </modifier>
                   </modifiers>
-                  <constraints/>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="aa23-f746-361b-9f3a" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="ce60-db94-576e-9f6d" name="" hidden="false" targetId="d29a-1484-5f9f-5971" type="selectionEntry">
                   <profiles/>
@@ -9433,14 +9486,18 @@
                       <conditionGroups/>
                     </modifier>
                   </modifiers>
-                  <constraints/>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="40d2-f518-afc6-d1e0" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="7a25-b3fa-1493-1591" name="" hidden="false" targetId="683a-c1e6-c15e-f5af" type="selectionEntry">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
                   <modifiers/>
-                  <constraints/>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="46f7-aec2-9297-66d2" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="5fac-5810-a515-664a" name="" hidden="false" targetId="43b3-4776-5f2b-7b5e" type="selectionEntry">
                   <profiles/>
@@ -9453,7 +9510,9 @@
                       <conditionGroups/>
                     </modifier>
                   </modifiers>
-                  <constraints/>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e694-a530-234d-f69f" type="max"/>
+                  </constraints>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
@@ -30438,7 +30497,7 @@ A unit can only make a Soulburst action once per turn.</description>
       <rules/>
       <infoLinks/>
       <modifiers/>
-      <description>When firing a weapon with this special rule, a To Wound roll of a 6 wounds automatically, regardless of the target&apos;s Toughness, and is resolved at AP2.</description>
+      <description>When firing a weapon with this special rule, a To Wound roll of a 6 wounds automatically, regardless of the target’s Toughness, and is resolved at AP2.</description>
     </rule>
     <rule id="b332-fe52-672a-d79b" name="Runes of the Farseer" book="Codex: Craftworlds" hidden="false">
       <profiles/>
@@ -31549,4 +31608,4 @@ A unit can only make a Soulburst action once per turn.</description>
       </characteristics>
     </profile>
   </sharedProfiles>
-</catalogue>
+</catalogue>
\ No newline at end of file