diff --git a/Cult_of_Yurei.cat b/Cult_of_Yurei.cat
index 484aac3..afe1d7b 100644
--- a/Cult_of_Yurei.cat
+++ b/Cult_of_Yurei.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="1ac7-2939-2874-7530" name="Cult of Yurei" revision="32" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="18" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="1ac7-2939-2874-7530" name="Cult of Yurei" revision="33" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <selectionEntries>
     <selectionEntry id="5048-3a52-5689-6d0b" name="Drain Spirit" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
@@ -709,11 +709,6 @@ When this model causes an Enemy model to be removed from play as a result of a M
     </selectionEntry>
     <selectionEntry id="98a8-2097-0f7e-9013" name="Taka" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="122f-7320-74ec-c0e3" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="3d1a-95ec-c1e9-360f" type="atLeast"/>
-          </conditions>
-        </modifier>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
             <conditionGroup type="or">
@@ -727,7 +722,6 @@ When this model causes an Enemy model to be removed from play as a result of a M
       </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="6abe-2438-071f-73e2" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="122f-7320-74ec-c0e3" type="min"/>
       </constraints>
       <profiles>
         <profile id="71a5-1fe4-0220-2abf" name="Taka" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -1186,15 +1180,9 @@ Wounds caused by this effect ignore Armor and Tough.</characteristic>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="set" field="be95-6bfa-414e-9adf" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="a92a-3883-5182-6373" type="atLeast"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="eb4d-e5c5-1bc0-6b90" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="be95-6bfa-414e-9adf" type="min"/>
       </constraints>
       <profiles>
         <profile id="12d2-b28e-331a-5860" name="Kato, the Puppet Master" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -1813,15 +1801,9 @@ Models that fail gain Vengeance [Rokuro] until the action is resolved.</characte
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="set" field="dc6e-8d9b-7d6c-9e2f" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e830-ba03-e838-4068" type="atLeast"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="13d6-82e1-0c82-9b38" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dc6e-8d9b-7d6c-9e2f" type="min"/>
       </constraints>
       <profiles>
         <profile id="1ba1-55e3-8361-a8fb" name="Senbo" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -1932,7 +1914,6 @@ If this model is removed from play, also remove any Friendly Envy from play.</ch
       </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="dbca-09f5-9658-9c43" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f4e1-2de9-938e-fa9f" type="min"/>
       </constraints>
       <profiles>
         <profile id="482f-456a-855d-3081" name="Souta" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -3981,11 +3962,6 @@ Permitted [Gok, Kairai, Burakumin, Kato]</characteristic>
     </selectionEntry>
     <selectionEntry id="6f35-0d5e-770a-b81f" name="Envy" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="1200-4dd9-0b5a-b56a" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="609b-0413-7c94-c5f0" type="atLeast"/>
-          </conditions>
-        </modifier>
         <modifier type="set" field="hidden" value="true">
           <conditions>
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="609b-0413-7c94-c5f0" type="lessThan"/>
@@ -3993,7 +3969,6 @@ Permitted [Gok, Kairai, Burakumin, Kato]</characteristic>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1200-4dd9-0b5a-b56a" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8d41-d2e3-f950-0d7c" type="max"/>
       </constraints>
       <profiles>
@@ -4073,11 +4048,6 @@ Permitted [Gok, Kairai, Burakumin, Kato]</characteristic>
     </selectionEntry>
     <selectionEntry id="3d1a-95ec-c1e9-360f" name="Wrath" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="0903-ae98-cd1c-f191" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="98a8-2097-0f7e-9013" type="atLeast"/>
-          </conditions>
-        </modifier>
         <modifier type="set" field="hidden" value="true">
           <conditions>
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="98a8-2097-0f7e-9013" type="lessThan"/>
@@ -4085,7 +4055,6 @@ Permitted [Gok, Kairai, Burakumin, Kato]</characteristic>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0903-ae98-cd1c-f191" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b1bb-2659-da2a-58ca" type="max"/>
       </constraints>
       <profiles>
@@ -4155,11 +4124,6 @@ Permitted [Gok, Kairai, Burakumin, Kato]</characteristic>
     </selectionEntry>
     <selectionEntry id="e063-46b2-c459-4b6f" name="Sloth" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="f6fe-3c17-2458-5c61" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="3bf5-62ee-efbf-2baf" type="atLeast"/>
-          </conditions>
-        </modifier>
         <modifier type="set" field="hidden" value="true">
           <conditions>
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="3bf5-62ee-efbf-2baf" type="lessThan"/>
@@ -4167,7 +4131,6 @@ Permitted [Gok, Kairai, Burakumin, Kato]</characteristic>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f6fe-3c17-2458-5c61" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="89d6-65f2-3629-3b69" type="max"/>
       </constraints>
       <profiles>
@@ -4247,11 +4210,6 @@ Permitted [Gok, Kairai, Burakumin, Kato]</characteristic>
     </selectionEntry>
     <selectionEntry id="a92a-3883-5182-6373" name="Marionette" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="0f08-73ba-4d65-0e3c" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b49b-6987-598a-9b9c" type="atLeast"/>
-          </conditions>
-        </modifier>
         <modifier type="set" field="hidden" value="true">
           <conditions>
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="b49b-6987-598a-9b9c" type="lessThan"/>
@@ -4259,7 +4217,6 @@ Permitted [Gok, Kairai, Burakumin, Kato]</characteristic>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0f08-73ba-4d65-0e3c" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="8b9c-af30-d134-08dc" type="max"/>
       </constraints>
       <profiles>
@@ -4992,16 +4949,8 @@ When this card has 5 or more Ki Tokens on it, remove this Profane Idol from play
       </costs>
     </selectionEntry>
     <selectionEntry id="9fcf-6d30-70cd-e1a9" name="Yuta of Yurei" hidden="false" collective="false" import="true" type="upgrade">
-      <modifiers>
-        <modifier type="set" field="0d1f-477a-0ccf-50ca" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="07f1-1f68-612b-2b36" type="atLeast"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0128-82e3-2ed8-485b" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0d1f-477a-0ccf-50ca" type="min"/>
       </constraints>
       <profiles>
         <profile id="5b1d-0544-2d39-e1f0" name="Yuta of Yurei" hidden="false" typeId="d2bb-86b4-edf3-c4e5" typeName="Special Card">
@@ -5288,11 +5237,6 @@ No model may be chosen more than once.</characteristic>
     </selectionEntry>
     <selectionEntry id="e780-195e-0d42-c4e6" name="Gluttony" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="set" field="ea4d-9530-0f19-8326" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f42b-9d5d-1409-3b88" type="atLeast"/>
-          </conditions>
-        </modifier>
         <modifier type="set" field="hidden" value="true">
           <conditions>
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f42b-9d5d-1409-3b88" type="lessThan"/>
@@ -5300,7 +5244,6 @@ No model may be chosen more than once.</characteristic>
         </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ea4d-9530-0f19-8326" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8f30-7ec2-6f03-5745" type="max"/>
       </constraints>
       <profiles>
@@ -5383,7 +5326,6 @@ No model may be chosen more than once.</characteristic>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="dd43-0e4d-7e41-3f34" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9870-79b1-e07e-1a0c" type="min"/>
       </constraints>
       <profiles>
         <profile id="f97c-e325-4b6e-0448" name="Shokuji" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -5683,13 +5625,11 @@ If neither option is available this model is removed from play as usual.</charac
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4672-d27a-3e2a-a44d" type="atLeast"/>
           </conditions>
           <modifiers>
-            <modifier type="set" field="eb10-90bd-bce8-59fd" value="1.0"/>
             <modifier type="set" field="hidden" value="false"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="eb10-90bd-bce8-59fd" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" id="4b4c-ec58-c128-f122" type="max"/>
       </constraints>
       <profiles>
@@ -6816,12 +6756,10 @@ During the End Phase you may decide the order States are resolved.</characterist
           </conditions>
           <modifiers>
             <modifier type="set" field="hidden" value="false"/>
-            <modifier type="set" field="1689-c41f-7c69-f954" value="1.0"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1689-c41f-7c69-f954" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2341-3ac9-de6f-4eb6" type="max"/>
       </constraints>
       <profiles>
diff --git a/Jung_Pirates.cat b/Jung_Pirates.cat
index 988ad35..ef3df9d 100644
--- a/Jung_Pirates.cat
+++ b/Jung_Pirates.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="d615-aef7-31d5-367d" name="Jung Pirates" revision="34" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="18" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="d615-aef7-31d5-367d" name="Jung Pirates" revision="35" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="258a-e1a8-8db1-9635" name="Ki&lt;2" hidden="true"/>
     <categoryEntry id="f6c9-50fa-a9d3-e9f3" name="Ranged Weapon" hidden="true"/>
@@ -4282,13 +4282,11 @@ Requirement [Warbands that have recruited The Deep Theme or a Kancho]</character
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e61c-ac21-1f8e-94a2" type="atLeast"/>
           </conditions>
           <modifiers>
-            <modifier type="set" field="73e7-1fa9-12e1-9532" value="1.0"/>
             <modifier type="set" field="hidden" value="false"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="73e7-1fa9-12e1-9532" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d475-aeb3-732d-8571" type="max"/>
       </constraints>
       <profiles>
diff --git a/Kage_Kaze_Zoku.cat b/Kage_Kaze_Zoku.cat
index a7d8c8a..6561a73 100644
--- a/Kage_Kaze_Zoku.cat
+++ b/Kage_Kaze_Zoku.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="b4d7-0e2a-728f-20cf" name="Kage Kaze Zoku" revision="32" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="18" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="b4d7-0e2a-728f-20cf" name="Kage Kaze Zoku" revision="33" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <selectionEntries>
     <selectionEntry id="33d5-3364-f1d4-a94c" name="Lockdown" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
@@ -3865,15 +3865,7 @@ requirements.</characteristic>
       </costs>
     </selectionEntry>
     <selectionEntry id="d210-0c33-37e3-65c4" name="Conjured Shadow Crows" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="set" field="9b6d-de93-357b-c266" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="0aac-f274-ebc0-e6be" type="atLeast"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9b6d-de93-357b-c266" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8ebd-c7fa-97cb-7021" type="max"/>
       </constraints>
       <profiles>
diff --git a/Kinshi_Temple.cat b/Kinshi_Temple.cat
index b0d8073..9d06ed4 100644
--- a/Kinshi_Temple.cat
+++ b/Kinshi_Temple.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="67f3-e3c0-9b54-71fa" name="Kinshi Temple" revision="14" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="17" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="67f3-e3c0-9b54-71fa" name="Kinshi Temple" revision="15" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <selectionEntries>
     <selectionEntry id="096c-e1e9-7274-9439" name="Master Shi" hidden="false" collective="false" import="true" type="model">
       <constraints>
@@ -712,7 +712,6 @@ Permitted [Satsui]</characteristic>
     </selectionEntry>
     <selectionEntry id="eca6-be42-ae00-6884" name="Blessings of the Void" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a5ed-5bfd-d43d-da13" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f054-1565-4a7c-0075" type="max"/>
       </constraints>
       <profiles>
@@ -1072,7 +1071,6 @@ Add 1 to a Friendly Monk model’s statistics until the current activation is co
     <selectionEntry id="3f30-8199-9534-5074" name="Void Rift" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3904-e851-1dfe-3c49" type="max"/>
-        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="60c5-ea5a-345f-663a" type="min"/>
       </constraints>
       <profiles>
         <profile id="72ab-060b-65e5-8369" name="Void Rift" hidden="false" typeId="6fa2-988d-fc04-c751" typeName="Special Card (Terrain)">
diff --git a/Minimoto_Clan.cat b/Minimoto_Clan.cat
index cbbf1ef..1d9c7e4 100644
--- a/Minimoto_Clan.cat
+++ b/Minimoto_Clan.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="d2c8-91e9-1a97-89b4" name="Minimoto Clan" revision="31" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="18" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="d2c8-91e9-1a97-89b4" name="Minimoto Clan" revision="32" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="6b68-2575-cc8f-c08f" name="Armour 3+" hidden="false"/>
   </categoryEntries>
@@ -2203,14 +2203,12 @@ This model may be recruited into any Minimoto Theme that does not restrict it.</
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="87b3-c945-caeb-f332" type="atLeast"/>
           </conditions>
           <modifiers>
-            <modifier type="set" field="cbde-1895-2bf4-4be0" value="1.0"/>
             <modifier type="set" field="hidden" value="false"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="798a-6ba1-bc1e-6cb4" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cbde-1895-2bf4-4be0" type="min"/>
       </constraints>
       <profiles>
         <profile id="752c-917d-6713-fbcd" name="Blessing of Steel" hidden="false" typeId="d2bb-86b4-edf3-c4e5" typeName="Special Card">
@@ -2237,14 +2235,12 @@ This model may be recruited into any Minimoto Theme that does not restrict it.</
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="3f95-c0aa-ac59-2d8b" type="atLeast"/>
           </conditions>
           <modifiers>
-            <modifier type="set" field="fe9f-bfe1-5506-3053" value="1.0"/>
             <modifier type="set" field="hidden" value="false"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="b11a-b8bd-afb7-f87f" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fe9f-bfe1-5506-3053" type="min"/>
       </constraints>
       <profiles>
         <profile id="e483-12d3-afea-b380" name="Weighted Tetsubo" hidden="false" typeId="d2bb-86b4-edf3-c4e5" typeName="Special Card">
@@ -2271,14 +2267,12 @@ This model may be recruited into any Minimoto Theme that does not restrict it.</
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="797b-a8f3-dcdd-165a" type="atLeast"/>
           </conditions>
           <modifiers>
-            <modifier type="set" field="9da1-46ab-a2a5-10c5" value="1.0"/>
             <modifier type="set" field="hidden" value="false"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="c001-9241-fa85-a98a" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9da1-46ab-a2a5-10c5" type="min"/>
       </constraints>
       <profiles>
         <profile id="e256-c424-ffa3-423f" name="Dedicated Blade" hidden="false" typeId="e3e5-fd2b-c549-aa9f" typeName="Special Card (Melee Weapon)">
@@ -2672,7 +2666,7 @@ Until the End Phase, all Ki Feats from Communal cards cost one additional Ki Tok
             <characteristic name="Melee Pool" typeId="eea0-d5a3-2540-a974">4</characteristic>
             <characteristic name="Melee Boost" typeId="4d43-9498-6fa0-8277">3</characteristic>
             <characteristic name="Ranged Pool" typeId="54f1-7472-e609-b4eb">3</characteristic>
-            <characteristic name="Ranged Boost" typeId="5454-b765-a65d-8a33"></characteristic>
+            <characteristic name="Ranged Boost" typeId="5454-b765-a65d-8a33"/>
             <characteristic name="Move" typeId="91b7-833e-fd8e-a620">4</characteristic>
             <characteristic name="Move Boost" typeId="f168-6d2b-e60e-28ac"/>
             <characteristic name="Ki" typeId="3969-9568-a914-6854">2</characteristic>
@@ -2750,7 +2744,7 @@ Until the End Phase, all Ki Feats from Communal cards cost one additional Ki Tok
                 <characteristic name="Ranged Weapon Strength" typeId="15aa-b6bd-6923-271f">Special</characteristic>
                 <characteristic name="Range Bands" typeId="be6a-50c6-d691-e2e9">-/4/-</characteristic>
                 <characteristic name="Traits" typeId="3410-4428-ef91-eb61">Ammo (2)</characteristic>
-                <characteristic name="Specials" typeId="cdaf-b6ac-89d4-39ef"></characteristic>
+                <characteristic name="Specials" typeId="cdaf-b6ac-89d4-39ef"/>
                 <characteristic name="Unique Effects" typeId="3bf8-6525-f003-4990">On a successful Attack, centre a 1&quot; Pulse on the target.
 Models in the Pulse gain a Fire (1) Marker and a Stunned Marker.</characteristic>
               </characteristics>
diff --git a/Shiho_Clan.cat b/Shiho_Clan.cat
index 145e52f..3f82ee9 100644
--- a/Shiho_Clan.cat
+++ b/Shiho_Clan.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="2276-2df6-78a7-841d" name="Shiho Clan" revision="34" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="18" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="2276-2df6-78a7-841d" name="Shiho Clan" revision="35" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <categoryEntries>
     <categoryEntry id="7fa5-7ef0-59c5-f657" name="Tanaka" hidden="false"/>
   </categoryEntries>
@@ -41,19 +41,8 @@
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="set" field="aa6b-277b-3a0a-b373" value="1.0">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7265-24a0-f489-3a0d" type="atLeast"/>
-                <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7bda-31ca-310f-2f3d" type="atLeast"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="aa6b-277b-3a0a-b373" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1ef9-7110-860b-fc67" type="max"/>
       </constraints>
       <profiles>
diff --git a/Silvermoon_Trade_Syndicate.cat b/Silvermoon_Trade_Syndicate.cat
index 7df4053..bda585b 100644
--- a/Silvermoon_Trade_Syndicate.cat
+++ b/Silvermoon_Trade_Syndicate.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="6a8f-b352-80c6-855f" name="Silvermoon Trade Syndicate" revision="33" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="18" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="6a8f-b352-80c6-855f" name="Silvermoon Trade Syndicate" revision="34" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <selectionEntries>
     <selectionEntry id="5048-3a52-5689-6d0b" name="Bought Loyalty" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
@@ -5804,12 +5804,10 @@ This does not cause this model to lose an Activation Counter.</characteristic>
           <modifiers>
             <modifier type="set" field="a111-8656-5c05-7415" value="0.0"/>
             <modifier type="set" field="hidden" value="false"/>
-            <modifier type="set" field="c026-c3bd-b34c-4981" value="1.0"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c026-c3bd-b34c-4981" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6cf9-d448-a7a1-eb41" type="max"/>
       </constraints>
       <categoryLinks>
diff --git a/Temple_of_Ro-Kan.cat b/Temple_of_Ro-Kan.cat
index 8dff81e..250e298 100644
--- a/Temple_of_Ro-Kan.cat
+++ b/Temple_of_Ro-Kan.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="4213-717c-2228-e731" name="Temple of Ro-Kan" revision="39" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="18" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="4213-717c-2228-e731" name="Temple of Ro-Kan" revision="40" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <selectionEntries>
     <selectionEntry id="5048-3a52-5689-6d0b" name="Spiritual Harmony" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
@@ -4219,14 +4219,11 @@ If it does, it loses the Monk type and gains an ability based on the type of Kam
           </conditions>
           <modifiers>
             <modifier type="set" field="hidden" value="false"/>
-            <modifier type="set" field="401a-1b68-f15f-6de1" value="1.0"/>
-            <modifier type="set" field="f161-fa88-14ac-daa7" value="1.0"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="401a-1b68-f15f-6de1" type="min"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f161-fa88-14ac-daa7" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f161-fa88-14ac-daa7" type="max"/>
       </constraints>
       <profiles>
         <profile id="7963-b73f-a862-8c0e" name="Kota - Fox Form" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -5546,14 +5543,11 @@ This model may only be included in Followers of Inari Theme.</characteristic>
           </conditions>
           <modifiers>
             <modifier type="set" field="hidden" value="false"/>
-            <modifier type="set" field="1ab4-d966-16f1-a05d" value="1.0"/>
-            <modifier type="set" field="bf74-46c0-6260-5ecf" value="1.0"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bf74-46c0-6260-5ecf" type="min"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1ab4-d966-16f1-a05d" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1ab4-d966-16f1-a05d" type="max"/>
       </constraints>
       <profiles>
         <profile id="28ec-7dc6-a2b5-8df1" name="The White-Faced Fox - Human Form" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -5672,14 +5666,11 @@ At the start of this model&apos;s activation choose one of the following:
           </conditions>
           <modifiers>
             <modifier type="set" field="hidden" value="false"/>
-            <modifier type="set" field="5b03-8b57-c933-750b" value="1.0"/>
-            <modifier type="set" field="ad65-86c0-967c-2868" value="1.0"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ad65-86c0-967c-2868" type="min"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5b03-8b57-c933-750b" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5b03-8b57-c933-750b" type="max"/>
       </constraints>
       <profiles>
         <profile id="6c43-a983-9cef-9a3e" name="Takeru - Fox Form" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -6001,14 +5992,11 @@ When Deploying this model you must Deploy the Kuoto - Fox Form model and begin t
           </conditions>
           <modifiers>
             <modifier type="set" field="hidden" value="false"/>
-            <modifier type="set" field="1672-4fb8-7c73-1580" value="1.0"/>
-            <modifier type="set" field="b1a4-64e4-356e-2527" value="1.0"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b1a4-64e4-356e-2527" type="min"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1672-4fb8-7c73-1580" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b1a4-64e4-356e-2527" type="max"/>
       </constraints>
       <profiles>
         <profile id="3666-bbe8-1fb0-9f73" name="Kuoto - Human Form" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -6383,15 +6371,12 @@ Requirement [Followers of Inari Theme]</characteristic>
             <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="true" childId="1852-ad90-8733-95b0" type="atLeast"/>
           </conditions>
           <modifiers>
-            <modifier type="set" field="3ad8-1120-825d-7b72" value="1.0"/>
-            <modifier type="set" field="f168-9eed-8937-a76b" value="1.0"/>
             <modifier type="set" field="hidden" value="false"/>
           </modifiers>
         </modifierGroup>
       </modifierGroups>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3ad8-1120-825d-7b72" type="min"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f168-9eed-8937-a76b" type="max"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f168-9eed-8937-a76b" type="max"/>
       </constraints>
       <profiles>
         <profile id="33d7-23d6-cd40-f349" name="Inari-Age (Equipment - Enhancement)" hidden="false" typeId="d2bb-86b4-edf3-c4e5" typeName="Special Card">
diff --git a/The_Savage_Wave.cat b/The_Savage_Wave.cat
index 76428de..3438dba 100644
--- a/The_Savage_Wave.cat
+++ b/The_Savage_Wave.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="0b85-0901-eb64-b84b" name="The Savage Wave" revision="35" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="18" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="0b85-0901-eb64-b84b" name="The Savage Wave" revision="36" battleScribeVersion="2.03" library="false" gameSystemId="62e4-ab79-1c4c-9ffe" gameSystemRevision="19" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <selectionEntries>
     <selectionEntry id="5048-3a52-5689-6d0b" name="Ambush" hidden="false" collective="false" import="true" type="upgrade">
       <constraints>
@@ -354,15 +354,9 @@ Exclusion [Animal, Cavalry]</characteristic>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="set" field="c7ca-5cb4-3584-ffc3" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="85d6-8be6-0155-ec5a" type="atLeast"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="17c9-c792-f99c-ac02" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c7ca-5cb4-3584-ffc3" type="min"/>
       </constraints>
       <profiles>
         <profile id="da72-c08c-b201-a680" name="Xi-Han" hidden="false" typeId="08e8-3cf2-6d1d-b8f0" typeName="Character Profile">
@@ -2728,16 +2722,8 @@ On a successful ranged attack the Target gains a Stunned marker.</characteristic
       </costs>
     </selectionEntry>
     <selectionEntry id="5132-d58b-2573-7d92" name="Bakemono Horde" hidden="false" collective="false" import="true" type="unit">
-      <modifiers>
-        <modifier type="set" field="1a7b-86a4-c920-130e" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1afa-b4a3-cd57-56c8" type="atLeast"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <constraints>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b9d3-cf2e-67b9-42fc" type="max"/>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1a7b-86a4-c920-130e" type="min"/>
       </constraints>
       <profiles>
         <profile id="901d-e774-0e66-31ae" name="Bakemono Horde &quot;Out of the Underworld&quot;" hidden="true" typeId="d2bb-86b4-edf3-c4e5" typeName="Special Card">
@@ -2800,14 +2786,8 @@ On a successful ranged attack the Target gains a Stunned marker.</characteristic
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="set" field="f0fa-6155-9646-56e2" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="90cc-09e6-8e61-a99a" type="atLeast"/>
-          </conditions>
-        </modifier>
       </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f0fa-6155-9646-56e2" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3cbf-3c34-1392-ae7a" type="max"/>
       </constraints>
       <profiles>
@@ -4794,15 +4774,7 @@ This model may Move through Destructible terrain; if you do, remove the terrain
       </costs>
     </selectionEntry>
     <selectionEntry id="0f79-2c43-477d-9552" name="Ushi, The Sadistic" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="set" field="adbf-e0f2-9ae0-68de" value="1.0">
-          <conditions>
-            <condition field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5466-549f-2eb8-3488" type="atLeast"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <constraints>
-        <constraint field="selections" scope="roster" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="adbf-e0f2-9ae0-68de" type="min"/>
         <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0e37-9bae-27ed-3968" type="max"/>
       </constraints>
       <profiles>