diff --git a/Galactic Republic.cat b/Galactic Republic.cat
index bf5ce51..6d840fe 100644
--- a/Galactic Republic.cat	
+++ b/Galactic Republic.cat	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <catalogue id="aa80-2c3e-6e78-52b4" name="Galactic Republic" revision="7" battleScribeVersion="2.03" authorName="vadersson" authorContact="vadersson or vadersson109 most places online" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="33" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Added latest preview</comment>
-  <readme>Added Venator II and Pelta Titles</readme>
+  <comment>Added all data from Clone Wars Wave 2.</comment>
+  <readme>Added all revealed cards.  Still Missing Pelta transport</readme>
   <selectionEntries>
     <selectionEntry id="e5f4-441f-affd-1db8" name="Delta-7 Aethersprite" hidden="false" collective="false" import="true" type="unit">
       <constraints>
@@ -227,7 +227,7 @@
         <entryLink id="75f9-bc63-7cee-4645" name="Weapons Team" hidden="false" collective="false" import="true" targetId="baa5-7a1e-92ea-a312" type="selectionEntryGroup"/>
         <entryLink id="1a62-1eb9-f59b-2378" name="Offensive Retrofit" hidden="false" collective="false" import="true" targetId="0a55-2f8b-aff3-154e" type="selectionEntryGroup">
           <modifiers>
-            <modifier type="increment" field="maxSelections" value="2.0"/>
+            <modifier type="increment" field="maxSelections" value="1.0"/>
           </modifiers>
         </entryLink>
         <entryLink id="9345-752f-2f28-489e" name="Ordnance" hidden="false" collective="false" import="true" targetId="23f2-ace7-4294-434e" type="selectionEntryGroup"/>
@@ -1276,13 +1276,13 @@ While defending, after the attacker gathers dice, you may spend 1 [Brace] token.
             <cost name="pts" typeId="points" value="5.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="2b24-3434-8fa3-fdec" name="Grav Shift Reroute" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="2b24-3434-8fa3-fdec" name="•Grav Shift Reroute" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="maxInRoster" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="229d-dcb3-3d4c-2f0e" type="max"/>
           </constraints>
           <profiles>
-            <profile id="1e30-7d0a-1d0a-58ed" name="Grav Shift Reroute" hidden="false" typeId="2907-d622-4480-ea97" typeName="5.3 Experimental Retrofit">
+            <profile id="1e30-7d0a-1d0a-58ed" name="•Grav Shift Reroute" hidden="false" typeId="2907-d622-4480-ea97" typeName="5.3 Experimental Retrofit">
               <characteristics>
                 <characteristic name="Experimental Retrofit Ability" typeId="8e5f-9df9-a449-7982">Before deploying fleets, place 1 grav shift token anywhere in the play area.  After deploying fleets, you may move each obstacle at distance 1-3 of that token to within distance 2 of that obstacle&apos;s current location.  Obstacles cannot overlap tokens, obstacles, or ships.</characteristic>
                 <characteristic name="Setup" typeId="3b02-afb1-2eac-4d8d"/>
@@ -1597,6 +1597,25 @@ The battery armaments for your left and right hull zones are increased by 1 blue
             <cost name="pts" typeId="points" value="9.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="014c-3a16-0b22-8e78" name="Point Defense Ion Cannons" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="13b5-52a4-e711-0ec0" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="a97b-5ef9-5b15-bb66" name="Point Defense Ion Cannons" hidden="false" typeId="82fe-f045-0a3b-a5da" typeName="6.2 Ion Cannons">
+              <characteristics>
+                <characteristic name="Ion Cannons Ability" typeId="2ce0-48c0-d090-1720">Non-huge ship only.
+While defending at close range or distance 1, during the Spend Defense Tokens step, you may force the attacker to reroll 1 die of your choice.</characteristic>
+                <characteristic name="Setup" typeId="bff8-e0b0-0377-41c5"/>
+                <characteristic name="Recur" typeId="aba1-c625-09d8-540a"/>
+                <characteristic name="Ready Cost" typeId="18ca-2956-de71-852a"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="4.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="0a55-2f8b-aff3-154e" name="Offensive Retrofit" hidden="false" collective="false" import="true">
@@ -1668,7 +1687,7 @@ When you activate, you may exhaust this card to choose 1 enemy ship of your size
             </profile>
           </profiles>
           <entryLinks>
-            <entryLink id="fb0c-b5af-eb19-d9fd" name="" hidden="false" collective="false" import="true" targetId="4a8e-0cd7-d82c-267d" type="selectionEntry"/>
+            <entryLink id="fb0c-b5af-eb19-d9fd" name="Modification" hidden="false" collective="false" import="true" targetId="4a8e-0cd7-d82c-267d" type="selectionEntry"/>
           </entryLinks>
           <costs>
             <cost name="pts" typeId="points" value="6.0"/>
@@ -1918,6 +1937,65 @@ Friendly Heavy squadrons at distance 1-2 prevent engaged squadrons from attackin
             <cost name="pts" typeId="points" value="5.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="da66-d428-b8a4-f624" name="Flak Guns" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="37ce-6c1b-cb55-31d0" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="2d9b-22a2-b664-a0b6" name="Flak Guns" hidden="false" typeId="ebbe-2c25-a937-60f3" typeName="5.1 Offensive Retrofit">
+              <characteristics>
+                <characteristic name="Offensive Retrofit Ability" typeId="cfe9-897e-edba-6c69">Treat each die in your anti-squadron armament as black.
+While performing a [Salvo] attack, the black dice in your battery armamentt can be used at medium range and the blue dice in your battery armament can be used at long range.</characteristic>
+                <characteristic name="Setup" typeId="c5c0-97fc-eb28-1983"/>
+                <characteristic name="Recur" typeId="cdc3-8791-d7fb-4d2a"/>
+                <characteristic name="Ready Cost" typeId="cb24-1848-db0d-5c8f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="773b-89cb-6631-6d7c" name="SPHA-T" hidden="false" collective="false" import="true" type="upgrade">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="and">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="4a8e-0cd7-d82c-267d" type="atLeast"/>
+                    <condition field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="773b-89cb-6631-6d7c" type="equalTo"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4441-8dd7-3d5c-b655" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="e008-5166-633f-888c" name="SPHA-T" hidden="false" typeId="ebbe-2c25-a937-60f3" typeName="5.1 Offensive Retrofit">
+              <characteristics>
+                <characteristic name="Offensive Retrofit Ability" typeId="cfe9-897e-edba-6c69">Treat each die in your anti-squadron armament as black.
+While performing a [Salvo] attack, the black dice in your battery armamentt can be used at medium range and the blue dice in your battery armament can be used at long range.</characteristic>
+                <characteristic name="Setup" typeId="c5c0-97fc-eb28-1983">Modification.  &quot;Star Destroyer&quot; only.
+Decrease your squadron value by 2.
+Ignition [Close]
+Each of your front, left, or right firing arcs is also a special firing arc.  You have a special battery armament of 5 blue dice and 1 black die.
+After you place your targeting token, exhaust this card.  While this card is exhausted, you cannont place targeting tokens.</characteristic>
+                <characteristic name="Recur" typeId="cdc3-8791-d7fb-4d2a">Non-Recur
+</characteristic>
+                <characteristic name="Ready Cost" typeId="cb24-1848-db0d-5c8f">1 [Concentrate Fire] token
+</characteristic>
+              </characteristics>
+            </profile>
+          </profiles>
+          <entryLinks>
+            <entryLink id="12ee-4559-e4e4-1312" name="Modification" hidden="false" collective="false" import="true" targetId="4a8e-0cd7-d82c-267d" type="selectionEntry"/>
+          </entryLinks>
+          <costs>
+            <cost name="pts" typeId="points" value="7.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="10d5-12af-b773-cd45" name="Officer" hidden="false" collective="false" import="true">
@@ -3095,6 +3173,24 @@ When you reveal a command, you may exhaust this card to choose 1 of your hull zo
             <cost name="pts" typeId="points" value="4.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="1ebe-365c-49e1-5101" name="DBY-827 Heavy Turbolasers" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4457-3716-dac3-e07c" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="9e84-d16c-97a8-176f" name="DBY-827 Heavy Turbolasers" hidden="false" typeId="f6bb-908e-778e-3884" typeName="6.3 Turbolasers">
+              <characteristics>
+                <characteristic name="Turbolasers Ability" typeId="43e5-b6c8-39de-139b">While performing a [Salvo] attack, you may change 1 die to a face with a [Crit] icon.</characteristic>
+                <characteristic name="Setup" typeId="0612-1ebf-fc72-3853"/>
+                <characteristic name="Recur" typeId="d983-0594-058a-0e02"/>
+                <characteristic name="Ready Cost" typeId="8391-4b57-4643-bf2f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="baa5-7a1e-92ea-a312" name="Weapons Team" hidden="false" collective="false" import="true">
@@ -3547,16 +3643,37 @@ When a friendly squadron with Adept is destroyed, you may choose 1 enemy ship at
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8a4a-d6b7-2848-a6d9" type="max"/>
       </constraints>
       <selectionEntries>
-        <selectionEntry id="21af-46dc-65c2-2a65" name="•Swift Return (temp)" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="21af-46dc-65c2-2a65" name="•Resolute" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="7244-5501-ee6f-b02b" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f427-cf6f-27c0-33c6" type="max"/>
           </constraints>
           <profiles>
-            <profile id="c91e-c4e0-2228-3979" name="•Swift Return (temp)" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+            <profile id="c91e-c4e0-2228-3979" name="•Resolute" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
               <characteristics>
-                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">During your Determine Course step, if you are at distance 1-2 of an obstacle, you may change your speed by 1 or increased 1 yaw value by 1.</characteristic>
-                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"/>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">You must choose at least 2 types of command tokens for this card.
+After you resolve a command by spending a dial, you may discard 1 matching command token from this card to gain that token.</characteristic>
+                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006">4 [Repair] or [Squadron] or [Concentrate Fire] tokens
+</characteristic>
+                <characteristic name="Recur" typeId="cf46-034d-372c-3792"/>
+                <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="6.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="e353-6de6-95f5-7415" name="•Tranquility" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="8e30-9394-231d-0dea" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4b84-1ba1-1ed0-7cca" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="d7f4-63c2-7b30-c7c8" name="•Tranquility" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+              <characteristics>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">While defending, after the Spend Defense Tokens step, if you spent fewer than 2 defense tokens, you may move up to 2 shields from 1 of your hull zones to the defending hull zone.  If you do, the number of shields in that zone cannot exceed a maxiumum of &quot;6.&quot; You cannot recover shields while any zone is greater than its maximum shield value.</characteristic>
+                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"></characteristic>
                 <characteristic name="Recur" typeId="cf46-034d-372c-3792"/>
                 <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
               </characteristics>
@@ -3566,6 +3683,26 @@ When a friendly squadron with Adept is destroyed, you may choose 1 enemy ship at
             <cost name="pts" typeId="points" value="3.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="7b56-b9ca-133a-8daf" name="•Triumphant" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="e146-9c86-c20f-f0c7" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2e50-a077-6b8c-3ce7" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="36e5-9d11-15cd-7006" name="•Triumphant" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+              <characteristics>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">While another friendly non-flotilla ship resolves a [Squadron] command, up to 3 squadrons without Adept that it activates can be at close range of your (even if the squadrons are beyond close-medium range of that ship).
+This effect is not active during the first round.</characteristic>
+                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"></characteristic>
+                <characteristic name="Recur" typeId="cf46-034d-372c-3792"/>
+                <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="5.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="f6dd-e2ee-ffb7-2631" name="Title - Pelta-class Frigate" hidden="false" collective="false" import="true">
diff --git a/Imperial Navy.cat b/Imperial Navy.cat
index cc854eb..57c533b 100644
--- a/Imperial Navy.cat	
+++ b/Imperial Navy.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="0edc-79db-18a8-7153" name="Imperial Navy" revision="47" battleScribeVersion="2.03" authorName="Brian Black with updates by vadersson" authorContact="Brian_Black on BGG and FFG Forums vadersson most places." library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="0edc-79db-18a8-7153" name="Imperial Navy" revision="48" battleScribeVersion="2.03" authorName="Brian Black with updates by vadersson" authorContact="Brian_Black on BGG and FFG Forums vadersson most places." library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="33" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>Fixed some messed up data
 Added max speed stat to ships</comment>
   <readme>Fixed Messed up data
@@ -3908,6 +3908,25 @@ The battery armaments for your left and right hull zones are increased by 1 blue
             <cost name="pts" typeId="points" value="9.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="d101-25f9-656c-e74f" name="Point Defense Ion Cannons" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b5d-8d83-129f-8cf7" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="994b-de34-aef8-36e8" name="Point Defense Ion Cannons" hidden="false" typeId="82fe-f045-0a3b-a5da" typeName="6.2 Ion Cannons">
+              <characteristics>
+                <characteristic name="Ion Cannons Ability" typeId="2ce0-48c0-d090-1720">Non-huge ship only.
+While defending at close range or distance 1, during the Spend Defense Tokens step, you may force the attacker to reroll 1 die of your choice.</characteristic>
+                <characteristic name="Setup" typeId="bff8-e0b0-0377-41c5"/>
+                <characteristic name="Recur" typeId="aba1-c625-09d8-540a"/>
+                <characteristic name="Ready Cost" typeId="18ca-2956-de71-852a"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="4.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="0a55-2f8b-aff3-154e" name="Offensive Retrofit" hidden="false" collective="false" import="true">
@@ -4211,6 +4230,25 @@ When you activate, you may exhaust this card to choose 1 enemy ship of your size
             <cost name="pts" typeId="points" value="6.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="9634-bcb8-34d9-8c48" name="Flak Guns" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4dd8-6b69-81cc-9be1" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="9eb4-f8e9-bbec-eba6" name="Flak Guns" hidden="false" typeId="ebbe-2c25-a937-60f3" typeName="5.1 Offensive Retrofit">
+              <characteristics>
+                <characteristic name="Offensive Retrofit Ability" typeId="cfe9-897e-edba-6c69">Treat each die in your anti-squadron armament as black.
+While performing a [Salvo] attack, the black dice in your battery armamentt can be used at medium range and the blue dice in your battery armament can be used at long range.</characteristic>
+                <characteristic name="Setup" typeId="c5c0-97fc-eb28-1983"/>
+                <characteristic name="Recur" typeId="cdc3-8791-d7fb-4d2a"/>
+                <characteristic name="Ready Cost" typeId="cb24-1848-db0d-5c8f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="10d5-12af-b773-cd45" name="Officer" hidden="false" collective="false" import="true">
@@ -6050,6 +6088,24 @@ While attacking a ship with a higher speed than yours, you may add 1 blue die to
             <cost name="pts" typeId="points" value="4.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="4fda-1232-524b-7770" name="DBY-827 Heavy Turbolasers" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb78-1952-fa07-d58e" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="506f-34bc-25cb-91a0" name="DBY-827 Heavy Turbolasers" hidden="false" typeId="f6bb-908e-778e-3884" typeName="6.3 Turbolasers">
+              <characteristics>
+                <characteristic name="Turbolasers Ability" typeId="43e5-b6c8-39de-139b">While performing a [Salvo] attack, you may change 1 die to a face with a [Crit] icon.</characteristic>
+                <characteristic name="Setup" typeId="0612-1ebf-fc72-3853"/>
+                <characteristic name="Recur" typeId="d983-0594-058a-0e02"/>
+                <characteristic name="Ready Cost" typeId="8391-4b57-4643-bf2f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="baa5-7a1e-92ea-a312" name="Weapons Team" hidden="false" collective="false" import="true">
diff --git a/Rebel Fleet.cat b/Rebel Fleet.cat
index 3efa29f..4d8a814 100644
--- a/Rebel Fleet.cat	
+++ b/Rebel Fleet.cat	
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ebb6-1d9a-63f3-4ef6" name="Rebel Fleet" revision="48" battleScribeVersion="2.03" authorName="Brian Black with updates by vadersson" authorContact="Brian_Black on BGG and FFG Forums
-vadersson in lots of places" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Fixed messed up data files
-Added max speed stat for ships</comment>
-  <readme>Fixed some messed up data files.
-Added a max speed stat to ship entries.</readme>
+<catalogue id="ebb6-1d9a-63f3-4ef6" name="Rebel Fleet" revision="49" battleScribeVersion="2.03" authorName="Brian Black with updates by vadersson" authorContact="Brian_Black on BGG and FFG Forums vadersson in lots of places" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="33" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>Added Clone Wars Wave 2 Cards</comment>
+  <readme>Added all cards from Clone Wars Wave 2</readme>
   <selectionEntries>
     <selectionEntry id="7234-a2c9-5ef1-5b36" name="A-Wing" hidden="false" collective="false" import="true" type="unit">
       <constraints>
@@ -3081,6 +3078,25 @@ The battery armaments for your left and right hull zones are increased by 1 blue
             <cost name="pts" typeId="points" value="9.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="d0ae-a2c4-c4b4-15cf" name="Point Defense Ion Cannons" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c894-426f-0a35-f0d4" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="06be-8dbf-1450-a988" name="Point Defense Ion Cannons" hidden="false" typeId="82fe-f045-0a3b-a5da" typeName="6.2 Ion Cannons">
+              <characteristics>
+                <characteristic name="Ion Cannons Ability" typeId="2ce0-48c0-d090-1720">Non-huge ship only.
+While defending at close range or distance 1, during the Spend Defense Tokens step, you may force the attacker to reroll 1 die of your choice.</characteristic>
+                <characteristic name="Setup" typeId="bff8-e0b0-0377-41c5"/>
+                <characteristic name="Recur" typeId="aba1-c625-09d8-540a"/>
+                <characteristic name="Ready Cost" typeId="18ca-2956-de71-852a"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="4.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="0a55-2f8b-aff3-154e" name="Offensive Retrofit" hidden="false" collective="false" import="true">
@@ -3384,6 +3400,25 @@ You cannot spend a command token to resolve a [Fleet Command] card&apos;s effect
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="0e61-d5fd-f87b-5451" name="Flak Guns" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ce9b-523d-491e-0950" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="f7ed-a70b-4c56-dead" name="Flak Guns" hidden="false" typeId="ebbe-2c25-a937-60f3" typeName="5.1 Offensive Retrofit">
+              <characteristics>
+                <characteristic name="Offensive Retrofit Ability" typeId="cfe9-897e-edba-6c69">Treat each die in your anti-squadron armament as black.
+While performing a [Salvo] attack, the black dice in your battery armamentt can be used at medium range and the blue dice in your battery armament can be used at long range.</characteristic>
+                <characteristic name="Setup" typeId="c5c0-97fc-eb28-1983"/>
+                <characteristic name="Recur" typeId="cdc3-8791-d7fb-4d2a"/>
+                <characteristic name="Ready Cost" typeId="cb24-1848-db0d-5c8f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="10d5-12af-b773-cd45" name="Officer" hidden="false" collective="false" import="true">
@@ -5061,6 +5096,24 @@ While attacking a ship with a higher speed than yours, you may add 1 blue die to
             <cost name="pts" typeId="points" value="4.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="9220-a435-1aa5-79a5" name="DBY-827 Heavy Turbolasers" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8688-6fc5-1c74-d162" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="dfee-b416-efa7-8a6c" name="DBY-827 Heavy Turbolasers" hidden="false" typeId="f6bb-908e-778e-3884" typeName="6.3 Turbolasers">
+              <characteristics>
+                <characteristic name="Turbolasers Ability" typeId="43e5-b6c8-39de-139b">While performing a [Salvo] attack, you may change 1 die to a face with a [Crit] icon.</characteristic>
+                <characteristic name="Setup" typeId="0612-1ebf-fc72-3853"/>
+                <characteristic name="Recur" typeId="d983-0594-058a-0e02"/>
+                <characteristic name="Ready Cost" typeId="8391-4b57-4643-bf2f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="baa5-7a1e-92ea-a312" name="Weapons Team" hidden="false" collective="false" import="true">
diff --git a/Separatist Alliance.cat b/Separatist Alliance.cat
index 4356b64..1bc50be 100644
--- a/Separatist Alliance.cat	
+++ b/Separatist Alliance.cat	
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ae1c-e74b-aaa3-ec59" name="Separatist Alliance" revision="5" battleScribeVersion="2.03" authorName="vadersson" authorContact="vadersson or vadersson109 most places online" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="32" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Fixed some messed up data
-Added Max Speed Stat to ships</comment>
-  <readme>Fixed some messed up data
-Added a max speed stat to ships.</readme>
+<catalogue id="ae1c-e74b-aaa3-ec59" name="Separatist Alliance" revision="6" battleScribeVersion="2.03" authorName="vadersson" authorContact="vadersson or vadersson109 most places online" library="false" gameSystemId="4007-48b0-a016-7a8e" gameSystemRevision="33" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>Added Clone Wars Wave 2</comment>
+  <readme>Add all revealed data from Clone wars wave 2</readme>
   <selectionEntries>
     <selectionEntry id="e5f4-441f-affd-1db8" name="Droid Tri-Fighter" hidden="false" collective="false" import="true" type="unit">
       <constraints>
@@ -519,7 +517,11 @@ Added a max speed stat to ships.</readme>
       <entryLinks>
         <entryLink id="75dc-42a3-4244-d030" name="Commander" hidden="false" collective="false" import="true" targetId="d77d-f98a-9b86-934a" type="selectionEntryGroup"/>
         <entryLink id="cf57-33a9-83a1-d2d8" name="Fleet Support" hidden="false" collective="false" import="true" targetId="7ff0-e45e-cb37-dc1f" type="selectionEntryGroup"/>
-        <entryLink id="8393-ec70-69bc-e338" name="Officer" hidden="false" collective="false" import="true" targetId="10d5-12af-b773-cd45" type="selectionEntryGroup"/>
+        <entryLink id="8393-ec70-69bc-e338" name="Officer" hidden="false" collective="false" import="true" targetId="10d5-12af-b773-cd45" type="selectionEntryGroup">
+          <modifiers>
+            <modifier type="increment" field="maxSelections" value="1.0"/>
+          </modifiers>
+        </entryLink>
         <entryLink id="62da-be3c-abbf-8d6f" name="Support Team" hidden="false" collective="false" import="true" targetId="92d1-8354-bcb8-38fc" type="selectionEntryGroup"/>
         <entryLink id="af77-62cd-553b-2229" name="Title - Hardcell-class" hidden="false" collective="false" import="true" targetId="aca3-46d3-9915-1ed3" type="selectionEntryGroup"/>
       </entryLinks>
@@ -684,9 +686,9 @@ Added a max speed stat to ships.</readme>
         <cost name="pts" typeId="points" value="85.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="7953-a4ce-f74b-c466" name="Providence-class Dreadbought" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="7953-a4ce-f74b-c466" name="Providence-class Dreadnought" hidden="false" collective="false" import="true" type="model">
       <profiles>
-        <profile id="519b-175a-da9e-875a" name="Providence-class Dreadbought" hidden="false" typeId="e72b-10bf-c14e-b3a8" typeName="1.1 Ships">
+        <profile id="519b-175a-da9e-875a" name="Providence-class Dreadnought" hidden="false" typeId="e72b-10bf-c14e-b3a8" typeName="1.1 Ships">
           <modifiers>
             <modifier type="set" field="5ba4-e836-287d-1b42" value="Officer, Weapons Team, Fleet Command, Offensive Retrofit, Ordnance, Ion Cannon, Turbolasers, Turbolasers">
               <conditions>
@@ -697,10 +699,10 @@ Added a max speed stat to ships.</readme>
           <characteristics>
             <characteristic name="Hull" typeId="dce4-e1e2-4600-db77">9</characteristic>
             <characteristic name="Anti-Squadron Value" typeId="4691-4ce0-0e70-7711">1 Blue</characteristic>
-            <characteristic name="Command" typeId="1d2d-071c-feaa-7f6e"/>
-            <characteristic name="Squadron" typeId="b7a0-8944-9c2a-ca69"/>
-            <characteristic name="Engineering" typeId="6069-def8-10bd-ab4b"/>
-            <characteristic name="Defense Tokens" typeId="f211-7be9-035b-a0cf"/>
+            <characteristic name="Command" typeId="1d2d-071c-feaa-7f6e">3</characteristic>
+            <characteristic name="Squadron" typeId="b7a0-8944-9c2a-ca69">4</characteristic>
+            <characteristic name="Engineering" typeId="6069-def8-10bd-ab4b">4</characteristic>
+            <characteristic name="Defense Tokens" typeId="f211-7be9-035b-a0cf">Brace, Redirect, Contain, Salvo</characteristic>
             <characteristic name="Front Firing Arc" typeId="8d51-161b-6a35-8c8c">2 Red, 1 Blue, 2 Black</characteristic>
             <characteristic name="Left Firing Arc" typeId="b4b4-b590-eb56-726f">3 Red, 1 Blue, 2 Black</characteristic>
             <characteristic name="Right Firing Arc" typeId="748c-7972-54e2-1bd1">3 Red, 1 Blue, 2 Black</characteristic>
@@ -708,7 +710,7 @@ Added a max speed stat to ships.</readme>
             <characteristic name="Front Shield Value" typeId="b626-c94b-bb41-4893">5</characteristic>
             <characteristic name="Left Shield Value" typeId="634e-fa2b-63b6-bef2">3</characteristic>
             <characteristic name="Right Shield Value" typeId="590e-4eb6-d942-884d">3</characteristic>
-            <characteristic name="Rear Shield Value" typeId="5753-1a48-06df-40af">1</characteristic>
+            <characteristic name="Rear Shield Value" typeId="5753-1a48-06df-40af">2</characteristic>
             <characteristic name="Upgrade Bar" typeId="5ba4-e836-287d-1b42">Officer, Weapons Team, Offensive Retrofit, Ordnance, Ion Cannon, Turbolasers, Turbolasers</characteristic>
             <characteristic name="Keywords" typeId="44b7-80c3-1f4f-8b7c">Droid.  Bombard.  Transport</characteristic>
             <characteristic name="Max Speed" typeId="b650-9c38-4a65-44a7">3</characteristic>
@@ -724,7 +726,7 @@ Added a max speed stat to ships.</readme>
         <entryLink id="018a-a8ae-16f2-c62b" name="Offensive Retrofit" hidden="false" collective="false" import="true" targetId="0a55-2f8b-aff3-154e" type="selectionEntryGroup"/>
         <entryLink id="4d7c-2850-edff-c999" name="Officer" hidden="false" collective="false" import="true" targetId="10d5-12af-b773-cd45" type="selectionEntryGroup"/>
         <entryLink id="da00-4ca5-edef-6dd9" name="Weapons Team" hidden="false" collective="false" import="true" targetId="baa5-7a1e-92ea-a312" type="selectionEntryGroup"/>
-        <entryLink id="123a-dc04-a052-81e3" name="Turbolasers" hidden="false" collective="false" import="true" targetId="919f-0faf-d84f-79ff" type="selectionEntryGroup"/>
+        <entryLink id="123a-dc04-a052-81e3" name="Ion Cannons" hidden="false" collective="false" import="true" targetId="a176-c60f-7d96-1496" type="selectionEntryGroup"/>
         <entryLink id="025f-218d-0ccb-d286" name="Ordnance" hidden="false" collective="false" import="true" targetId="23f2-ace7-4294-434e" type="selectionEntryGroup"/>
         <entryLink id="5d4f-b596-d611-20b2" name="Title - Providence-class" hidden="false" collective="false" import="true" targetId="808f-0581-30f1-9ce3" type="selectionEntryGroup"/>
         <entryLink id="fb2b-13d6-6ad0-6136" name="Fleet Command" hidden="false" collective="false" import="true" targetId="69c5-17fb-4def-4b65" type="selectionEntryGroup">
@@ -736,6 +738,11 @@ Added a max speed stat to ships.</readme>
             </modifier>
           </modifiers>
         </entryLink>
+        <entryLink id="5512-f5f3-fa09-d49f" name="Turbolasers" hidden="false" collective="false" import="true" targetId="919f-0faf-d84f-79ff" type="selectionEntryGroup">
+          <modifiers>
+            <modifier type="increment" field="maxSelections" value="1.0"/>
+          </modifiers>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" typeId="points" value="105.0"/>
@@ -796,7 +803,7 @@ Added a max speed stat to ships.</readme>
         <entryLink id="9e1e-f0c1-319d-7a00" name="Ion Cannons" hidden="false" collective="false" import="true" targetId="a176-c60f-7d96-1496" type="selectionEntryGroup"/>
       </entryLinks>
       <costs>
-        <cost name="pts" typeId="points" value="85.0"/>
+        <cost name="pts" typeId="points" value="105.0"/>
       </costs>
     </selectionEntry>
   </selectionEntries>
@@ -928,7 +935,7 @@ At the start of each Ship Phase, you may discard 1 command token from this card.
           <profiles>
             <profile id="cdbe-0c2b-1483-c088" name="•TF-1726" hidden="false" typeId="ed38-5cd8-e875-d3e7" typeName="2.0 Commander">
               <characteristics>
-                <characteristic name="Commander Ability" typeId="1ebb-c216-cd61-f014"/>
+                <characteristic name="Commander Ability" typeId="1ebb-c216-cd61-f014">Once per activation, while a friendly ship is attacking a ship, the attacker adds 1 black die to its attack pool for each raid token the defender has, to a maximum of 2 additional dice.</characteristic>
                 <characteristic name="Setup" typeId="64ba-4cc9-c7ee-8717"/>
                 <characteristic name="Recur" typeId="cdbe-ae0d-96bc-7d42"/>
                 <characteristic name="Ready Cost" typeId="2fed-4325-7b01-be48"/>
@@ -939,7 +946,7 @@ At the start of each Ship Phase, you may discard 1 command token from this card.
             <infoLink id="8c43-96eb-eabb-962b" name="Flagship" hidden="false" targetId="f348-1bef-ddbf-98bb" type="rule"/>
           </infoLinks>
           <costs>
-            <cost name="pts" typeId="points" value="0.0"/>
+            <cost name="pts" typeId="points" value="26.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="be24-c569-2137-4f0e" name="•Mar Tuuk" hidden="false" collective="false" import="true" type="upgrade">
@@ -1114,6 +1121,37 @@ At the start of each Status Phase, you may recover 1 shield.</characteristic>
             <cost name="pts" typeId="points" value="4.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="c19b-eb08-eb97-9c30" name="Thermal Shields" hidden="false" collective="false" import="true" type="upgrade">
+          <modifiers>
+            <modifier type="set" field="hidden" value="false">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="034d-5d10-2acd-a23f" type="atLeast"/>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="28b9-dee2-dcc6-c2a7" type="atLeast"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0918-1345-7cd5-49ef" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="39fb-ba9f-e4e8-eccb" name="Thermal Shields" hidden="false" typeId="c4ed-b3c1-3b29-236e" typeName="5.2 Defensive Retrofit">
+              <characteristics>
+                <characteristic name="Defensive Retrofit Ability" typeId="8539-a418-bf73-51cd">Medium or Large ship only.
+While defending, after the attacker gathers dice, you may spend 1 [Brace] token.  If you do, choose and remove half of the dice in the attack pool, rounded down.</characteristic>
+                <characteristic name="Setup" typeId="1177-d2f9-43f7-1773"/>
+                <characteristic name="Recur" typeId="7280-a06c-6155-cccd"/>
+                <characteristic name="Ready Cost" typeId="803e-a62b-9cf4-a6d3"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="5.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="bcac-a7c9-2ab5-23b5" name="Experimental Retrofit" hidden="false" collective="false" import="true">
@@ -1496,6 +1534,25 @@ The battery armaments for your left and right hull zones are increased by 1 blue
             <cost name="pts" typeId="points" value="9.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="b6cf-8f4e-7005-da49" name="Point Defense Ion Cannons" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="04ec-6325-b65b-6725" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="1e72-c946-e16f-288c" name="Point Defense Ion Cannons" hidden="false" typeId="82fe-f045-0a3b-a5da" typeName="6.2 Ion Cannons">
+              <characteristics>
+                <characteristic name="Ion Cannons Ability" typeId="2ce0-48c0-d090-1720">Non-huge ship only.
+While defending at close range or distance 1, during the Spend Defense Tokens step, you may force the attacker to reroll 1 die of your choice.</characteristic>
+                <characteristic name="Setup" typeId="bff8-e0b0-0377-41c5"/>
+                <characteristic name="Recur" typeId="aba1-c625-09d8-540a"/>
+                <characteristic name="Ready Cost" typeId="18ca-2956-de71-852a"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="4.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="0a55-2f8b-aff3-154e" name="Offensive Retrofit" hidden="false" collective="false" import="true">
@@ -1817,6 +1874,44 @@ You cannot spend a command token to resolve a [Fleet Command] card&apos;s effect
             <cost name="pts" typeId="points" value="0.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="44e0-bc87-df8b-de39" name="B2 Rocket Troopers" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c078-e6e5-78a6-39f3" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="3e49-9429-0612-da82" name="B2 Rocket Troopers" hidden="false" typeId="ebbe-2c25-a937-60f3" typeName="5.1 Offensive Retrofit">
+              <characteristics>
+                <characteristic name="Offensive Retrofit Ability" typeId="cfe9-897e-edba-6c69">While performing a non-[Salvo] attack against a ship at close-medium range, you may exhaust this card.  If you do, the defender gains 1 raid token of your choice.
+While attacking a squadron, you may exhaust this card.  If you do, add 1 die of a color already in your attack pool to your attack pool.</characteristic>
+                <characteristic name="Setup" typeId="c5c0-97fc-eb28-1983"/>
+                <characteristic name="Recur" typeId="cdc3-8791-d7fb-4d2a">Recur</characteristic>
+                <characteristic name="Ready Cost" typeId="cb24-1848-db0d-5c8f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="7.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="2378-0d1c-16dc-f973" name="Flak Guns" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="76fc-b731-d37c-d8f4" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="238a-1a6f-12e4-209e" name="Flak Guns" hidden="false" typeId="ebbe-2c25-a937-60f3" typeName="5.1 Offensive Retrofit">
+              <characteristics>
+                <characteristic name="Offensive Retrofit Ability" typeId="cfe9-897e-edba-6c69">Treat each die in your anti-squadron armament as black.
+While performing a [Salvo] attack, the black dice in your battery armamentt can be used at medium range and the blue dice in your battery armament can be used at long range.</characteristic>
+                <characteristic name="Setup" typeId="c5c0-97fc-eb28-1983"/>
+                <characteristic name="Recur" typeId="cdc3-8791-d7fb-4d2a"/>
+                <characteristic name="Ready Cost" typeId="cb24-1848-db0d-5c8f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="10d5-12af-b773-cd45" name="Officer" hidden="false" collective="false" import="true">
@@ -3019,6 +3114,24 @@ When you reveal a command, you may exhaust this card to choose 1 of your hull zo
             <cost name="pts" typeId="points" value="4.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="57ea-2deb-caa1-9568" name="DBY-827 Heavy Turbolasers" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="111b-d235-787a-c358" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="7184-2e5a-2b3e-df25" name="DBY-827 Heavy Turbolasers" hidden="false" typeId="f6bb-908e-778e-3884" typeName="6.3 Turbolasers">
+              <characteristics>
+                <characteristic name="Turbolasers Ability" typeId="43e5-b6c8-39de-139b">While performing a [Salvo] attack, you may change 1 die to a face with a [Crit] icon.</characteristic>
+                <characteristic name="Setup" typeId="0612-1ebf-fc72-3853"/>
+                <characteristic name="Recur" typeId="d983-0594-058a-0e02"/>
+                <characteristic name="Ready Cost" typeId="8391-4b57-4643-bf2f"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="baa5-7a1e-92ea-a312" name="Weapons Team" hidden="false" collective="false" import="true">
@@ -3400,6 +3513,47 @@ Each of your hull zones cannot target the same ship or squadron more than once d
             <cost name="pts" typeId="points" value="6.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="aaf4-6fa8-dcdd-eb84" name="•Hot Landing" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6491-de39-2ceb-6574" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="a628-cfb6-1137-44e5" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="73c5-0c4d-883e-5d2a" name="•Hot Landing" hidden="false" typeId="1310-5c89-5c82-8e3b" typeName="4.2 Fleet Command">
+              <characteristics>
+                <characteristic name="Fleet Command Ability" typeId="67d1-23ac-2af6-6b5a">At the start of the Squadron Phase, friendly squadrons with Adept gain Grit until the end of the phase.
+When a friendly squadron with Adept is destroyed, you may choose 1 enemy ship at distance 1-2 of that squadron.  If you do, that ship gains 1 raid token of your choice.</characteristic>
+                <characteristic name="Setup" typeId="fe32-50a3-41a4-c521"/>
+                <characteristic name="Recur" typeId="90e2-ff61-cc26-03d7"/>
+                <characteristic name="Ready Cost" typeId="28f0-e3fe-0af2-dbab"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="513a-adef-a6ba-24d6" name="•Jedi Hostage" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d385-36d0-a6e7-1b63" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="fd8f-9e8c-d7fd-4c2f" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="893a-cadb-b1ee-81df" name="•Jedi Hostage" hidden="false" typeId="1310-5c89-5c82-8e3b" typeName="4.2 Fleet Command">
+              <characteristics>
+                <characteristic name="Fleet Command Ability" typeId="67d1-23ac-2af6-6b5a">When an enemy ship declares you as the target of a non-[Salvo] attack, if this card is readied, the attacker gains a raid token of its choice, if able.
+When an enemy ship at close range reveals a command, it may discard a [Squadron] dial to exhaust this card.
+While defending, if this card is exhausted, you cannot spend more than 1 defense token.</characteristic>
+                <characteristic name="Setup" typeId="fe32-50a3-41a4-c521"/>
+                <characteristic name="Recur" typeId="90e2-ff61-cc26-03d7">Non-Recur</characteristic>
+                <characteristic name="Ready Cost" typeId="28f0-e3fe-0af2-dbab"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="3.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
     <selectionEntryGroup id="de1c-158a-113c-72a6" name="Superweapon" hidden="false" collective="false" import="true">
@@ -3412,17 +3566,58 @@ Each of your hull zones cannot target the same ship or squadron more than once d
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3c35-12e7-ece7-39f4" type="max"/>
       </constraints>
       <selectionEntries>
-        <selectionEntry id="7501-1e27-8d82-0760" name="•Beast of Burden (temp)" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="7501-1e27-8d82-0760" name="•Gilded Aegis" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="fb30-19b4-00e3-3d5e" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ab64-6c86-3c7f-56c7" type="max"/>
           </constraints>
           <profiles>
-            <profile id="f26c-e120-fe2d-da0d" name="•Beast of Burden (temp)" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+            <profile id="f26c-e120-fe2d-da0d" name="•Gilded Aegis" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
               <characteristics>
-                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">When you activate, you may exhaust this card and spend 1 or more of your defense tokens to choose up to that many defense tokens on friendly ships at distance 1-3 and ready those defense tokens.</characteristic>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">At the end of the Command Phase or Ship Phase, you may discard a [Redirect] defense token to move shields to 1 of your hull zones.  If you do, the number of shields in that zone cannot exceed a maximum of &quot;6&quot;.  You cannot recover shields in that zone while it is greater than its maximum shield value.</characteristic>
                 <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"/>
-                <characteristic name="Recur" typeId="cf46-034d-372c-3792">Recur</characteristic>
+                <characteristic name="Recur" typeId="cf46-034d-372c-3792"></characteristic>
+                <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="5.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="da49-8d6f-866e-397a" name="•Nova Defiant" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="bfa9-a30e-4142-3316" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1695-09e4-b51c-b96b" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="610a-52ee-64a7-a7b3" name="•Nova Defiant" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+              <characteristics>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">When you are deployed, you must choose 1 of each type of command token for this card.
+Your command value is increased to 4.
+You can be assigned more than 1 of each type of command token.
+When you reveal a command, you may discard all of the tokens from this card to gain them.</characteristic>
+                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006">1 of each command token</characteristic>
+                <characteristic name="Recur" typeId="cf46-034d-372c-3792"></characteristic>
+                <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="4.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="0647-8947-2987-a205" name="•Patriot Fist" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="19df-ee55-0910-b7a6" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8739-b78c-6216-dbc6" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="61ec-7ede-4b3e-1b63" name="•Patriot Fist" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+              <characteristics>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">While attacking a ship at medium-long range, if this is your first attack during your activation, you may add 2 blue dice to your attack pool.  If you do, you cannot attack again during this activation.</characteristic>
+                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"/>
+                <characteristic name="Recur" typeId="cf46-034d-372c-3792"></characteristic>
                 <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
               </characteristics>
             </profile>
@@ -3438,13 +3633,32 @@ Each of your hull zones cannot target the same ship or squadron more than once d
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1b3f-d53a-47e2-855b" type="max"/>
       </constraints>
       <selectionEntries>
-        <selectionEntry id="4d3d-26be-2163-06a2" name="•Invisible Hand" hidden="false" collective="false" import="true" type="upgrade">
+        <selectionEntry id="4d3d-26be-2163-06a2" name="•Invincible" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
             <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="a2bb-2849-e75e-ff37" type="max"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8739-3b16-a8a8-ec4c" type="max"/>
           </constraints>
           <profiles>
-            <profile id="b6c2-9356-d90e-c66a" name="•Invisible Hand" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+            <profile id="b6c2-9356-d90e-c66a" name="•Invincible" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+              <characteristics>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">You gain 1 additional [Defensive Retrofit] icon in your upgrade bar.</characteristic>
+                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"/>
+                <characteristic name="Recur" typeId="cf46-034d-372c-3792"/>
+                <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="5.0"/>
+          </costs>
+        </selectionEntry>
+        <selectionEntry id="9d22-f3eb-9ea9-79e0" name="•Invisible Hand" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="dcc6-2b3e-b42f-c5f0" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b35a-cce3-2fab-4112" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="874a-c69f-3b70-4098" name="•Invisible Hand" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
               <characteristics>
                 <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">While deploying fleets, if you are in the play area, when you would deploy a squadron with Swarm, you may set that squadron aside next to your ship card instead.  You may set aside up to 5 squadrons in this way.
 [Squadron]:  For each squadron you would activate with this command, you may place 1 of your set-aside squadron within distance 3.  If connot move this actication, and if it has AI, increase its AI valve by 1.</characteristic>
@@ -3458,6 +3672,26 @@ Each of your hull zones cannot target the same ship or squadron more than once d
             <cost name="pts" typeId="points" value="9.0"/>
           </costs>
         </selectionEntry>
+        <selectionEntry id="18d8-c65f-cd4a-0423" name="•Lucid Voice" hidden="false" collective="false" import="true" type="upgrade">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="2c0c-4396-93be-45ad" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4e64-e71f-51a0-e90c" type="max"/>
+          </constraints>
+          <profiles>
+            <profile id="06e8-7a84-962e-e12a" name="•Lucid Voice" hidden="false" typeId="16d6-f94c-4e0d-8993" typeName="2.1 Title">
+              <characteristics>
+                <characteristic name="Title Ability" typeId="7040-d6d1-e20e-c16c">Treat your rear hull zone&apos;s printed battery armament as 3 red dice.
+The battery armament of your left and right hull zones are each increased by 1 black die and decreased by 1 blue die.</characteristic>
+                <characteristic name="Setup" typeId="6f6a-5eba-c2ee-2006"/>
+                <characteristic name="Recur" typeId="cf46-034d-372c-3792"/>
+                <characteristic name="Ready Cost" typeId="b20e-3783-9a5e-dbf7"/>
+              </characteristics>
+            </profile>
+          </profiles>
+          <costs>
+            <cost name="pts" typeId="points" value="8.0"/>
+          </costs>
+        </selectionEntry>
       </selectionEntries>
     </selectionEntryGroup>
   </sharedSelectionEntryGroups>